From f6ee0584bff611ce1540af9f3d8ba501179dec0b Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 11 Apr 2018 12:23:51 +0000 Subject: [PATCH] Refactored logger variables to caps. --- .../game/data/scripts/ai/AbstractNpcAI.java | 2 +- .../ai/areas/CrumaTower/CrumaTower.java | 2 +- .../ai/areas/DenOfDevil/DenOfEvil.java | 4 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 4 +- .../EnchantedMegaliths.java | 2 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 6 +- .../scripts/ai/bosses/Antharas/Antharas.java | 2 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 4 +- .../scripts/ai/bosses/Sailren/Sailren.java | 2 +- .../data/scripts/ai/bosses/Tiat/Stage1.java | 7 +- .../CastleAmbassador/CastleAmbassador.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ManorManager/ManorManager.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 6 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../custom/events/Rabbits/Rabbits.java | 2 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../custom/listeners/ListenerTest.java | 14 +- .../data/scripts/handlers/MasterHandler.java | 12 +- .../L2StaticObjectInstanceAction.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 4 +- .../admincommandhandlers/AdminEditChar.java | 10 +- .../admincommandhandlers/AdminEnchant.java | 6 +- .../admincommandhandlers/AdminHeal.java | 4 +- .../admincommandhandlers/AdminMenu.java | 10 +- .../admincommandhandlers/AdminPunishment.java | 8 +- .../admincommandhandlers/AdminRepairChar.java | 4 +- .../admincommandhandlers/AdminShop.java | 6 +- .../admincommandhandlers/AdminShowQuests.java | 4 +- .../admincommandhandlers/AdminSkill.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 8 +- .../admincommandhandlers/AdminSummon.java | 6 +- .../admincommandhandlers/AdminTeleport.java | 8 +- .../admincommandhandlers/AdminUnblockIp.java | 4 +- .../admincommandhandlers/AdminZones.java | 4 +- .../handlers/bypasshandlers/Augment.java | 2 +- .../scripts/handlers/bypasshandlers/Buy.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../bypasshandlers/ItemAuctionLink.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +- .../handlers/bypasshandlers/Multisell.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 8 +- .../handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PlayerHelp.java | 2 +- .../bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/Wear.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 6 +- .../handlers/effecthandlers/Disarmor.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 6 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 2 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 2 +- .../itemhandlers/BlessedSpiritShot.java | 2 +- .../handlers/itemhandlers/EventItem.java | 4 +- .../itemhandlers/ExtractableItems.java | 2 +- .../handlers/itemhandlers/FishShots.java | 2 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 2 +- .../usercommandhandlers/ClanWarsList.java | 4 +- .../scripts/instances/AbstractInstance.java | 6 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 2 +- .../scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 24 +-- .../scripts/quests/QuestMasterHandler.java | 4 +- .../scripts/vehicles/AirShipController.java | 18 +- .../data/scripts/vehicles/BoatGludinRune.java | 4 +- .../scripts/vehicles/BoatInnadrilTour.java | 4 +- .../scripts/vehicles/BoatRunePrimeval.java | 4 +- .../commons/network/BaseRecievePacket.java | 4 +- .../commons/network/BaseSendablePacket.java | 6 +- .../commons/util/crypt/ScrambledKeyPair.java | 4 +- .../Manager/ForumsBBSManager.java | 6 +- .../data/sql/impl/CharNameTable.java | 20 +- .../gameserver/engines/DocumentBase.java | 22 +- .../engines/items/DocumentItem.java | 5 +- .../gameserver/geoengine/GeoEngine.java | 18 +- .../geoengine/GeoEnginePathfinding.java | 6 +- .../gameserver/handler/IActionHandler.java | 2 +- .../handler/IActionShiftHandler.java | 2 +- .../gameserver/handler/IBypassHandler.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../handler/IPunishmentHandler.java | 2 +- .../handler/IUserCommandHandler.java | 2 +- .../instancemanager/CommissionManager.java | 10 +- .../instancemanager/FactionManager.java | 8 +- .../instancemanager/FortManager.java | 6 +- .../instancemanager/FortSiegeManager.java | 10 +- .../instancemanager/GraciaSeedsManager.java | 12 +- .../instancemanager/GrandBossManager.java | 20 +- .../instancemanager/ItemsOnGroundManager.java | 14 +- .../instancemanager/MentorManager.java | 8 +- .../instancemanager/PetitionManager.java | 6 +- .../instancemanager/ServerRestartManager.java | 6 +- .../instancemanager/SiegeManager.java | 10 +- .../tasks/MessageDeletionTask.java | 4 +- .../l2jmobius/gameserver/model/BlockList.java | 6 +- .../gameserver/model/CharEffectList.java | 4 +- .../gameserver/model/CursedWeapon.java | 16 +- .../l2jmobius/gameserver/model/L2Clan.java | 62 +++--- .../l2jmobius/gameserver/model/L2Mentee.java | 4 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +- .../gameserver/model/L2Territory.java | 4 +- .../l2jmobius/gameserver/model/MacroList.java | 8 +- .../l2jmobius/gameserver/model/ShortCuts.java | 8 +- .../l2jmobius/gameserver/model/TradeList.java | 38 ++-- .../gameserver/model/actor/L2Attackable.java | 6 +- .../gameserver/model/actor/L2Character.java | 4 +- .../gameserver/model/actor/L2Npc.java | 6 +- .../gameserver/model/actor/L2Vehicle.java | 6 +- .../instance/L2ControlTowerInstance.java | 2 +- .../model/actor/instance/L2DecoyInstance.java | 4 +- .../actor/instance/L2DefenderInstance.java | 2 +- .../model/actor/instance/L2DoorInstance.java | 2 +- .../actor/instance/L2MerchantInstance.java | 4 +- .../model/actor/instance/L2PcInstance.java | 196 +++++++++--------- .../model/actor/instance/L2PetInstance.java | 10 +- .../actor/instance/L2ServitorInstance.java | 4 +- .../instance/L2VillageMasterInstance.java | 4 +- .../gameserver/model/actor/stat/PetStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 4 +- .../model/actor/status/CharStatus.java | 4 +- .../actor/tasks/npc/RandomAnimationTask.java | 4 +- .../model/actor/tasks/npc/trap/TrapTask.java | 4 +- .../tasks/player/GameGuardCheckTask.java | 4 +- .../tasks/player/IllegalPlayerActionTask.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 4 +- .../model/announce/Announcement.java | 8 +- .../model/announce/AnnouncementType.java | 6 +- .../model/announce/AutoAnnouncement.java | 4 +- .../gameserver/model/buylist/Product.java | 4 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../model/entity/BlockCheckerEngine.java | 14 +- .../gameserver/model/entity/Castle.java | 36 ++-- .../gameserver/model/entity/Couple.java | 10 +- .../gameserver/model/entity/Duel.java | 10 +- .../gameserver/model/entity/Fort.java | 36 ++-- .../gameserver/model/entity/FortSiege.java | 38 ++-- .../gameserver/model/entity/L2Event.java | 12 +- .../gameserver/model/entity/Siege.java | 24 +-- .../model/events/AbstractScript.java | 66 +++--- .../model/events/EventDispatcher.java | 8 +- .../listeners/AnnotationEventListener.java | 4 +- .../listeners/FunctionEventListener.java | 4 +- .../model/itemcontainer/ItemContainer.java | 6 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PcInventory.java | 6 +- .../model/itemcontainer/PcRefund.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 2 +- .../model/items/enchant/EnchantItemGroup.java | 6 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../model/items/instance/L2ItemInstance.java | 4 +- .../model/olympiad/AbstractOlympiadGame.java | 12 +- .../model/olympiad/OlympiadGameManager.java | 6 +- .../model/olympiad/OlympiadGameNormal.java | 14 +- .../model/olympiad/OlympiadGameTask.java | 32 +-- .../model/punishment/PunishmentTask.java | 6 +- .../gameserver/model/quest/LongTimeEvent.java | 20 +- .../gameserver/model/quest/Quest.java | 42 ++-- .../gameserver/model/quest/QuestState.java | 6 +- .../gameserver/model/quest/QuestTimer.java | 4 +- .../model/shuttle/L2ShuttleEngine.java | 4 +- .../gameserver/model/skills/Skill.java | 14 +- .../model/skills/SkillChannelizer.java | 10 +- .../model/variables/AccountVariables.java | 8 +- .../model/variables/ClanVariables.java | 8 +- .../model/variables/ItemVariables.java | 10 +- .../model/variables/PlayerVariables.java | 8 +- .../gameserver/model/zone/L2ZoneRespawn.java | 2 +- .../gameserver/model/zone/L2ZoneType.java | 4 +- .../model/zone/type/L2EffectZone.java | 4 +- .../gameserver/network/L2GameClient.java | 10 +- .../gameserver/network/NpcStringId.java | 4 +- .../network/clientpackets/Action.java | 2 +- .../network/clientpackets/AddTradeItem.java | 4 +- .../clientpackets/CharacterCreate.java | 12 +- .../clientpackets/CharacterDelete.java | 2 +- .../clientpackets/CharacterSelect.java | 4 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 4 +- .../network/clientpackets/ExGetOnAirShip.java | 8 +- .../network/clientpackets/GameGuardReply.java | 2 +- .../clientpackets/IClientIncomingPacket.java | 2 +- .../network/clientpackets/Logout.java | 4 +- .../clientpackets/MultiSellChoose.java | 12 +- .../clientpackets/ProtocolVersion.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 8 +- .../RequestAcquireSkillInfo.java | 8 +- .../clientpackets/RequestActionUse.java | 4 +- .../network/clientpackets/RequestBlock.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../clientpackets/RequestBypassToServer.java | 10 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 2 +- .../clientpackets/RequestExChangeName.java | 2 +- .../RequestExCubeGameChangeTeam.java | 2 +- .../RequestExCubeGameReadyAnswer.java | 2 +- .../clientpackets/RequestExFishRanking.java | 2 +- .../RequestExMagicSkillUseGround.java | 2 +- .../RequestExTryToPutEnchantTargetItem.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 +- .../clientpackets/RequestMagicSkillList.java | 2 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 2 +- .../clientpackets/RequestPCCafeCouponUse.java | 2 +- .../clientpackets/RequestPackageSend.java | 6 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../RequestPetitionFeedback.java | 2 +- .../clientpackets/RequestPreviewItem.java | 4 +- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../RequestPrivateStoreSell.java | 2 +- .../clientpackets/RequestRefundItem.java | 2 +- .../RequestReplySurrenderPledgeWar.java | 2 +- .../network/clientpackets/RequestRestart.java | 4 +- .../clientpackets/RequestRestartPoint.java | 12 +- .../clientpackets/RequestSendPost.java | 4 +- .../RequestSetCastleSiegeTime.java | 10 +- .../network/clientpackets/Say2.java | 10 +- .../clientpackets/SendBypassBuildCmd.java | 4 +- .../SendWareHouseDepositList.java | 6 +- .../SendWareHouseWithDrawList.java | 4 +- .../network/clientpackets/UseItem.java | 2 +- .../clientpackets/ValidatePosition.java | 6 +- .../ability/RequestAcquireAbilityList.java | 16 +- .../alchemy/RequestAlchemyConversion.java | 2 +- .../commission/RequestCommissionRegister.java | 2 +- .../RequestCrystallizeEstimate.java | 2 +- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendDel.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 2 +- .../primeshop/RequestBRProductList.java | 2 +- .../sayune/RequestFlyMoveStart.java | 4 +- .../shuttle/RequestShuttleGetOn.java | 2 +- .../loginserverpackets/game/BlowFishKey.java | 4 +- .../serverpackets/AbstractHtmlPacket.java | 4 +- .../serverpackets/AbstractMessagePacket.java | 2 +- .../serverpackets/CharSelectionInfo.java | 8 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/IClientOutgoingPacket.java | 2 +- .../PledgeReceiveSubPledgeCreated.java | 2 +- .../serverpackets/RecipeItemMakeInfo.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../gameserver/script/DateRange.java | 4 +- .../gameserver/script/ScriptDocument.java | 8 +- .../security/SecondaryPasswordAuth.java | 20 +- .../taskmanager/AttackStanceTaskManager.java | 4 +- .../l2jmobius/gameserver/util/Broadcast.java | 4 +- .../com/l2jmobius/gameserver/util/Evolve.java | 6 +- .../gameserver/util/FloodProtectorAction.java | 14 +- .../l2jmobius/gameserver/util/GMAudit.java | 4 +- .../gameserver/util/OfflineTradeUtil.java | 4 +- .../loginserver/FloodProtectedListener.java | 12 +- .../loginserver/GameServerThread.java | 26 +-- .../l2jmobius/loginserver/L2LoginServer.java | 22 +- .../loginserver/LoginController.java | 28 +-- .../network/L2JGameServerPacketHandler.java | 8 +- .../loginserver/network/L2LoginClient.java | 4 +- .../clientpackets/RequestAuthLogin.java | 6 +- .../gameserverpackets/BlowFishKey.java | 4 +- .../gameserverpackets/ChangeAccessLevel.java | 4 +- .../gameserverpackets/ChangePassword.java | 6 +- .../gameserverpackets/GameServerAuth.java | 2 +- .../gameserverpackets/PlayerLogout.java | 2 +- .../gameserverpackets/PlayerTracert.java | 2 +- .../gameserverpackets/RequestTempBan.java | 4 +- .../gameserverpackets/ServerStatus.java | 2 +- .../network/serverpackets/ServerList.java | 4 +- .../loginserver/network/util/IPv4Filter.java | 4 +- .../game/data/scripts/ai/AbstractNpcAI.java | 2 +- .../ai/areas/CrumaTower/CrumaTower.java | 2 +- .../ai/areas/DenOfDevil/DenOfEvil.java | 4 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 4 +- .../EnchantedMegaliths.java | 2 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 6 +- .../scripts/ai/bosses/Antharas/Antharas.java | 2 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 4 +- .../scripts/ai/bosses/Sailren/Sailren.java | 2 +- .../data/scripts/ai/bosses/Tiat/Stage1.java | 7 +- .../CastleAmbassador/CastleAmbassador.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ManorManager/ManorManager.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 6 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../custom/events/Rabbits/Rabbits.java | 2 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../custom/listeners/ListenerTest.java | 14 +- .../data/scripts/handlers/MasterHandler.java | 12 +- .../L2StaticObjectInstanceAction.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 4 +- .../admincommandhandlers/AdminEditChar.java | 10 +- .../admincommandhandlers/AdminEnchant.java | 6 +- .../admincommandhandlers/AdminHeal.java | 4 +- .../admincommandhandlers/AdminMenu.java | 10 +- .../admincommandhandlers/AdminPunishment.java | 8 +- .../admincommandhandlers/AdminRepairChar.java | 4 +- .../admincommandhandlers/AdminShop.java | 6 +- .../admincommandhandlers/AdminShowQuests.java | 4 +- .../admincommandhandlers/AdminSkill.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 8 +- .../admincommandhandlers/AdminSummon.java | 6 +- .../admincommandhandlers/AdminTeleport.java | 8 +- .../admincommandhandlers/AdminUnblockIp.java | 4 +- .../admincommandhandlers/AdminZones.java | 4 +- .../handlers/bypasshandlers/Augment.java | 2 +- .../scripts/handlers/bypasshandlers/Buy.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../bypasshandlers/ItemAuctionLink.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +- .../handlers/bypasshandlers/Multisell.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 8 +- .../handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PlayerHelp.java | 2 +- .../bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/Wear.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 6 +- .../handlers/effecthandlers/Disarmor.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 6 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 2 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 2 +- .../itemhandlers/BlessedSpiritShot.java | 2 +- .../handlers/itemhandlers/EventItem.java | 4 +- .../itemhandlers/ExtractableItems.java | 2 +- .../handlers/itemhandlers/FishShots.java | 2 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 2 +- .../usercommandhandlers/ClanWarsList.java | 4 +- .../scripts/instances/AbstractInstance.java | 6 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 2 +- .../scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../Q10814_BefittingOfTheStatus.java | 2 +- .../scripts/quests/QuestMasterHandler.java | 4 +- .../scripts/vehicles/AirShipController.java | 18 +- .../data/scripts/vehicles/BoatGludinRune.java | 4 +- .../scripts/vehicles/BoatInnadrilTour.java | 4 +- .../scripts/vehicles/BoatRunePrimeval.java | 4 +- .../commons/network/BaseRecievePacket.java | 4 +- .../commons/network/BaseSendablePacket.java | 6 +- .../commons/util/crypt/ScrambledKeyPair.java | 4 +- .../Manager/ForumsBBSManager.java | 6 +- .../data/sql/impl/CharNameTable.java | 20 +- .../gameserver/engines/DocumentBase.java | 22 +- .../engines/items/DocumentItem.java | 5 +- .../gameserver/geoengine/GeoEngine.java | 18 +- .../geoengine/GeoEnginePathfinding.java | 6 +- .../gameserver/handler/IActionHandler.java | 2 +- .../handler/IActionShiftHandler.java | 2 +- .../gameserver/handler/IBypassHandler.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../handler/IPunishmentHandler.java | 2 +- .../handler/IUserCommandHandler.java | 2 +- .../instancemanager/CommissionManager.java | 10 +- .../instancemanager/FactionManager.java | 8 +- .../instancemanager/FortManager.java | 6 +- .../instancemanager/FortSiegeManager.java | 10 +- .../instancemanager/GraciaSeedsManager.java | 12 +- .../instancemanager/GrandBossManager.java | 20 +- .../instancemanager/ItemsOnGroundManager.java | 14 +- .../instancemanager/MentorManager.java | 8 +- .../instancemanager/PetitionManager.java | 6 +- .../instancemanager/ServerRestartManager.java | 6 +- .../instancemanager/SiegeManager.java | 10 +- .../tasks/MessageDeletionTask.java | 4 +- .../l2jmobius/gameserver/model/BlockList.java | 6 +- .../gameserver/model/CharEffectList.java | 4 +- .../gameserver/model/CursedWeapon.java | 16 +- .../l2jmobius/gameserver/model/L2Clan.java | 62 +++--- .../l2jmobius/gameserver/model/L2Mentee.java | 4 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +- .../gameserver/model/L2Territory.java | 4 +- .../l2jmobius/gameserver/model/MacroList.java | 8 +- .../l2jmobius/gameserver/model/ShortCuts.java | 8 +- .../l2jmobius/gameserver/model/TradeList.java | 38 ++-- .../gameserver/model/actor/L2Attackable.java | 6 +- .../gameserver/model/actor/L2Character.java | 4 +- .../gameserver/model/actor/L2Npc.java | 6 +- .../gameserver/model/actor/L2Vehicle.java | 6 +- .../instance/L2ControlTowerInstance.java | 2 +- .../model/actor/instance/L2DecoyInstance.java | 4 +- .../actor/instance/L2DefenderInstance.java | 2 +- .../model/actor/instance/L2DoorInstance.java | 2 +- .../actor/instance/L2MerchantInstance.java | 4 +- .../model/actor/instance/L2PcInstance.java | 196 +++++++++--------- .../model/actor/instance/L2PetInstance.java | 10 +- .../actor/instance/L2ServitorInstance.java | 4 +- .../instance/L2VillageMasterInstance.java | 4 +- .../gameserver/model/actor/stat/PetStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 4 +- .../model/actor/status/CharStatus.java | 4 +- .../actor/tasks/npc/RandomAnimationTask.java | 4 +- .../model/actor/tasks/npc/trap/TrapTask.java | 4 +- .../tasks/player/GameGuardCheckTask.java | 4 +- .../tasks/player/IllegalPlayerActionTask.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 4 +- .../model/announce/Announcement.java | 8 +- .../model/announce/AnnouncementType.java | 6 +- .../model/announce/AutoAnnouncement.java | 4 +- .../gameserver/model/buylist/Product.java | 4 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../model/entity/BlockCheckerEngine.java | 14 +- .../gameserver/model/entity/Castle.java | 36 ++-- .../gameserver/model/entity/Couple.java | 10 +- .../gameserver/model/entity/Duel.java | 10 +- .../gameserver/model/entity/Fort.java | 36 ++-- .../gameserver/model/entity/FortSiege.java | 38 ++-- .../gameserver/model/entity/L2Event.java | 12 +- .../gameserver/model/entity/Siege.java | 24 +-- .../model/events/AbstractScript.java | 66 +++--- .../model/events/EventDispatcher.java | 8 +- .../listeners/AnnotationEventListener.java | 4 +- .../listeners/FunctionEventListener.java | 4 +- .../model/itemcontainer/ItemContainer.java | 6 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PcInventory.java | 6 +- .../model/itemcontainer/PcRefund.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 2 +- .../model/items/enchant/EnchantItemGroup.java | 6 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../model/items/instance/L2ItemInstance.java | 4 +- .../model/olympiad/AbstractOlympiadGame.java | 12 +- .../model/olympiad/OlympiadGameManager.java | 6 +- .../model/olympiad/OlympiadGameNormal.java | 14 +- .../model/olympiad/OlympiadGameTask.java | 32 +-- .../model/punishment/PunishmentTask.java | 6 +- .../gameserver/model/quest/LongTimeEvent.java | 20 +- .../gameserver/model/quest/Quest.java | 42 ++-- .../gameserver/model/quest/QuestState.java | 6 +- .../gameserver/model/quest/QuestTimer.java | 4 +- .../model/shuttle/L2ShuttleEngine.java | 4 +- .../gameserver/model/skills/Skill.java | 14 +- .../model/skills/SkillChannelizer.java | 10 +- .../model/variables/AccountVariables.java | 8 +- .../model/variables/ClanVariables.java | 8 +- .../model/variables/ItemVariables.java | 10 +- .../model/variables/PlayerVariables.java | 8 +- .../gameserver/model/zone/L2ZoneRespawn.java | 2 +- .../gameserver/model/zone/L2ZoneType.java | 4 +- .../model/zone/type/L2EffectZone.java | 4 +- .../gameserver/network/L2GameClient.java | 10 +- .../gameserver/network/NpcStringId.java | 4 +- .../network/clientpackets/Action.java | 2 +- .../network/clientpackets/AddTradeItem.java | 4 +- .../clientpackets/CharacterCreate.java | 12 +- .../clientpackets/CharacterDelete.java | 2 +- .../clientpackets/CharacterSelect.java | 4 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 4 +- .../network/clientpackets/ExGetOnAirShip.java | 8 +- .../network/clientpackets/GameGuardReply.java | 2 +- .../clientpackets/IClientIncomingPacket.java | 2 +- .../network/clientpackets/Logout.java | 4 +- .../clientpackets/MultiSellChoose.java | 14 +- .../clientpackets/ProtocolVersion.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 8 +- .../RequestAcquireSkillInfo.java | 8 +- .../clientpackets/RequestActionUse.java | 4 +- .../network/clientpackets/RequestBlock.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../clientpackets/RequestBypassToServer.java | 10 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 2 +- .../clientpackets/RequestExChangeName.java | 2 +- .../RequestExCubeGameChangeTeam.java | 2 +- .../RequestExCubeGameReadyAnswer.java | 2 +- .../clientpackets/RequestExFishRanking.java | 2 +- .../RequestExMagicSkillUseGround.java | 2 +- .../RequestExTryToPutEnchantTargetItem.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 +- .../clientpackets/RequestMagicSkillList.java | 2 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 2 +- .../clientpackets/RequestPCCafeCouponUse.java | 2 +- .../clientpackets/RequestPackageSend.java | 6 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../RequestPetitionFeedback.java | 2 +- .../clientpackets/RequestPreviewItem.java | 4 +- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../RequestPrivateStoreSell.java | 2 +- .../clientpackets/RequestRefundItem.java | 2 +- .../RequestReplySurrenderPledgeWar.java | 2 +- .../network/clientpackets/RequestRestart.java | 4 +- .../clientpackets/RequestRestartPoint.java | 12 +- .../clientpackets/RequestSendPost.java | 4 +- .../RequestSetCastleSiegeTime.java | 10 +- .../network/clientpackets/Say2.java | 10 +- .../clientpackets/SendBypassBuildCmd.java | 4 +- .../SendWareHouseDepositList.java | 6 +- .../SendWareHouseWithDrawList.java | 4 +- .../network/clientpackets/UseItem.java | 2 +- .../clientpackets/ValidatePosition.java | 6 +- .../ability/RequestAcquireAbilityList.java | 16 +- .../alchemy/RequestAlchemyConversion.java | 2 +- .../commission/RequestCommissionRegister.java | 2 +- .../RequestCrystallizeEstimate.java | 2 +- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendDel.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 2 +- .../pledgebonus/RequestPledgeBonusReward.java | 2 +- .../primeshop/RequestBRProductList.java | 2 +- .../sayune/RequestFlyMoveStart.java | 4 +- .../shuttle/RequestShuttleGetOn.java | 2 +- .../loginserverpackets/game/BlowFishKey.java | 4 +- .../serverpackets/AbstractHtmlPacket.java | 4 +- .../serverpackets/AbstractMessagePacket.java | 2 +- .../serverpackets/CharSelectionInfo.java | 8 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/IClientOutgoingPacket.java | 2 +- .../PledgeReceiveSubPledgeCreated.java | 2 +- .../serverpackets/RecipeItemMakeInfo.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../gameserver/script/DateRange.java | 4 +- .../gameserver/script/ScriptDocument.java | 8 +- .../security/SecondaryPasswordAuth.java | 20 +- .../taskmanager/AttackStanceTaskManager.java | 4 +- .../l2jmobius/gameserver/util/Broadcast.java | 4 +- .../com/l2jmobius/gameserver/util/Evolve.java | 6 +- .../gameserver/util/FloodProtectorAction.java | 14 +- .../l2jmobius/gameserver/util/GMAudit.java | 4 +- .../gameserver/util/OfflineTradeUtil.java | 4 +- .../loginserver/FloodProtectedListener.java | 12 +- .../loginserver/GameServerThread.java | 26 +-- .../l2jmobius/loginserver/L2LoginServer.java | 22 +- .../loginserver/LoginController.java | 28 +-- .../network/L2JGameServerPacketHandler.java | 8 +- .../loginserver/network/L2LoginClient.java | 4 +- .../clientpackets/RequestAuthLogin.java | 6 +- .../gameserverpackets/BlowFishKey.java | 4 +- .../gameserverpackets/ChangeAccessLevel.java | 4 +- .../gameserverpackets/ChangePassword.java | 6 +- .../gameserverpackets/GameServerAuth.java | 2 +- .../gameserverpackets/PlayerLogout.java | 2 +- .../gameserverpackets/PlayerTracert.java | 2 +- .../gameserverpackets/RequestTempBan.java | 4 +- .../gameserverpackets/ServerStatus.java | 2 +- .../network/serverpackets/ServerList.java | 4 +- .../loginserver/network/util/IPv4Filter.java | 4 +- .../game/data/scripts/ai/AbstractNpcAI.java | 2 +- .../ai/areas/CrumaTower/CrumaTower.java | 2 +- .../ai/areas/DenOfDevil/DenOfEvil.java | 4 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 4 +- .../EnchantedMegaliths.java | 2 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 6 +- .../scripts/ai/bosses/Antharas/Antharas.java | 2 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 4 +- .../scripts/ai/bosses/Sailren/Sailren.java | 2 +- .../data/scripts/ai/bosses/Tiat/Stage1.java | 7 +- .../CastleAmbassador/CastleAmbassador.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ManorManager/ManorManager.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 6 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../custom/events/Rabbits/Rabbits.java | 2 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../custom/listeners/ListenerTest.java | 14 +- .../data/scripts/handlers/MasterHandler.java | 12 +- .../L2StaticObjectInstanceAction.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 4 +- .../admincommandhandlers/AdminEditChar.java | 10 +- .../admincommandhandlers/AdminEnchant.java | 6 +- .../admincommandhandlers/AdminHeal.java | 4 +- .../admincommandhandlers/AdminMenu.java | 10 +- .../admincommandhandlers/AdminPunishment.java | 8 +- .../admincommandhandlers/AdminRepairChar.java | 4 +- .../admincommandhandlers/AdminShop.java | 6 +- .../admincommandhandlers/AdminShowQuests.java | 4 +- .../admincommandhandlers/AdminSkill.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 8 +- .../admincommandhandlers/AdminSummon.java | 6 +- .../admincommandhandlers/AdminTeleport.java | 8 +- .../admincommandhandlers/AdminUnblockIp.java | 4 +- .../admincommandhandlers/AdminZones.java | 4 +- .../handlers/bypasshandlers/Augment.java | 2 +- .../scripts/handlers/bypasshandlers/Buy.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../bypasshandlers/ItemAuctionLink.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +- .../handlers/bypasshandlers/Multisell.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 8 +- .../handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PlayerHelp.java | 2 +- .../bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/Wear.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 6 +- .../handlers/effecthandlers/Disarmor.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 6 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 2 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 2 +- .../itemhandlers/BlessedSpiritShot.java | 2 +- .../handlers/itemhandlers/EventItem.java | 4 +- .../itemhandlers/ExtractableItems.java | 2 +- .../handlers/itemhandlers/FishShots.java | 2 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 2 +- .../usercommandhandlers/ClanWarsList.java | 4 +- .../scripts/instances/AbstractInstance.java | 6 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 2 +- .../scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../Q10814_BefittingOfTheStatus.java | 2 +- .../scripts/quests/QuestMasterHandler.java | 4 +- .../scripts/vehicles/AirShipController.java | 18 +- .../data/scripts/vehicles/BoatGludinRune.java | 4 +- .../scripts/vehicles/BoatInnadrilTour.java | 4 +- .../scripts/vehicles/BoatRunePrimeval.java | 4 +- .../commons/network/BaseRecievePacket.java | 4 +- .../commons/network/BaseSendablePacket.java | 6 +- .../commons/util/crypt/ScrambledKeyPair.java | 4 +- .../Manager/ForumsBBSManager.java | 6 +- .../data/sql/impl/CharNameTable.java | 20 +- .../gameserver/engines/DocumentBase.java | 22 +- .../engines/items/DocumentItem.java | 5 +- .../gameserver/geoengine/GeoEngine.java | 18 +- .../geoengine/GeoEnginePathfinding.java | 6 +- .../gameserver/handler/IActionHandler.java | 2 +- .../handler/IActionShiftHandler.java | 2 +- .../gameserver/handler/IBypassHandler.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../handler/IPunishmentHandler.java | 2 +- .../handler/IUserCommandHandler.java | 2 +- .../instancemanager/CommissionManager.java | 10 +- .../instancemanager/FactionManager.java | 8 +- .../instancemanager/FortManager.java | 6 +- .../instancemanager/FortSiegeManager.java | 10 +- .../instancemanager/GraciaSeedsManager.java | 12 +- .../instancemanager/GrandBossManager.java | 20 +- .../instancemanager/ItemsOnGroundManager.java | 14 +- .../instancemanager/MentorManager.java | 8 +- .../instancemanager/PetitionManager.java | 6 +- .../instancemanager/ServerRestartManager.java | 6 +- .../instancemanager/SiegeManager.java | 10 +- .../tasks/MessageDeletionTask.java | 4 +- .../l2jmobius/gameserver/model/BlockList.java | 6 +- .../gameserver/model/CharEffectList.java | 4 +- .../gameserver/model/CursedWeapon.java | 16 +- .../l2jmobius/gameserver/model/L2Clan.java | 62 +++--- .../l2jmobius/gameserver/model/L2Mentee.java | 4 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +- .../gameserver/model/L2Territory.java | 4 +- .../l2jmobius/gameserver/model/MacroList.java | 8 +- .../l2jmobius/gameserver/model/ShortCuts.java | 8 +- .../l2jmobius/gameserver/model/TradeList.java | 38 ++-- .../gameserver/model/actor/L2Attackable.java | 6 +- .../gameserver/model/actor/L2Character.java | 4 +- .../gameserver/model/actor/L2Npc.java | 6 +- .../gameserver/model/actor/L2Vehicle.java | 6 +- .../instance/L2ControlTowerInstance.java | 2 +- .../model/actor/instance/L2DecoyInstance.java | 4 +- .../actor/instance/L2DefenderInstance.java | 2 +- .../model/actor/instance/L2DoorInstance.java | 2 +- .../actor/instance/L2MerchantInstance.java | 4 +- .../model/actor/instance/L2PcInstance.java | 196 +++++++++--------- .../model/actor/instance/L2PetInstance.java | 10 +- .../actor/instance/L2ServitorInstance.java | 4 +- .../instance/L2VillageMasterInstance.java | 4 +- .../gameserver/model/actor/stat/PetStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 4 +- .../model/actor/status/CharStatus.java | 4 +- .../actor/tasks/npc/RandomAnimationTask.java | 4 +- .../model/actor/tasks/npc/trap/TrapTask.java | 4 +- .../tasks/player/GameGuardCheckTask.java | 4 +- .../tasks/player/IllegalPlayerActionTask.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 4 +- .../model/announce/Announcement.java | 8 +- .../model/announce/AnnouncementType.java | 6 +- .../model/announce/AutoAnnouncement.java | 4 +- .../gameserver/model/buylist/Product.java | 4 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../model/entity/BlockCheckerEngine.java | 14 +- .../gameserver/model/entity/Castle.java | 36 ++-- .../gameserver/model/entity/Couple.java | 10 +- .../gameserver/model/entity/Duel.java | 10 +- .../gameserver/model/entity/Fort.java | 36 ++-- .../gameserver/model/entity/FortSiege.java | 38 ++-- .../gameserver/model/entity/L2Event.java | 12 +- .../gameserver/model/entity/Siege.java | 24 +-- .../model/events/AbstractScript.java | 66 +++--- .../model/events/EventDispatcher.java | 8 +- .../listeners/AnnotationEventListener.java | 4 +- .../listeners/FunctionEventListener.java | 4 +- .../model/itemcontainer/ItemContainer.java | 6 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PcInventory.java | 6 +- .../model/itemcontainer/PcRefund.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 2 +- .../model/items/enchant/EnchantItemGroup.java | 6 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../model/items/instance/L2ItemInstance.java | 4 +- .../model/olympiad/AbstractOlympiadGame.java | 12 +- .../model/olympiad/OlympiadGameManager.java | 6 +- .../model/olympiad/OlympiadGameNormal.java | 14 +- .../model/olympiad/OlympiadGameTask.java | 32 +-- .../model/punishment/PunishmentTask.java | 6 +- .../gameserver/model/quest/LongTimeEvent.java | 20 +- .../gameserver/model/quest/Quest.java | 42 ++-- .../gameserver/model/quest/QuestState.java | 6 +- .../gameserver/model/quest/QuestTimer.java | 4 +- .../model/shuttle/L2ShuttleEngine.java | 4 +- .../gameserver/model/skills/Skill.java | 14 +- .../model/skills/SkillChannelizer.java | 10 +- .../model/variables/AccountVariables.java | 8 +- .../model/variables/ClanVariables.java | 8 +- .../model/variables/ItemVariables.java | 10 +- .../model/variables/PlayerVariables.java | 8 +- .../gameserver/model/zone/L2ZoneRespawn.java | 2 +- .../gameserver/model/zone/L2ZoneType.java | 4 +- .../model/zone/type/L2EffectZone.java | 4 +- .../gameserver/network/L2GameClient.java | 10 +- .../gameserver/network/NpcStringId.java | 4 +- .../network/clientpackets/Action.java | 2 +- .../network/clientpackets/AddTradeItem.java | 4 +- .../clientpackets/CharacterCreate.java | 12 +- .../clientpackets/CharacterDelete.java | 2 +- .../clientpackets/CharacterSelect.java | 4 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 4 +- .../network/clientpackets/ExGetOnAirShip.java | 8 +- .../network/clientpackets/GameGuardReply.java | 2 +- .../clientpackets/IClientIncomingPacket.java | 2 +- .../network/clientpackets/Logout.java | 4 +- .../clientpackets/MultiSellChoose.java | 14 +- .../clientpackets/ProtocolVersion.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 8 +- .../RequestAcquireSkillInfo.java | 8 +- .../clientpackets/RequestActionUse.java | 4 +- .../network/clientpackets/RequestBlock.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../clientpackets/RequestBypassToServer.java | 10 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 2 +- .../clientpackets/RequestExChangeName.java | 2 +- .../RequestExCubeGameChangeTeam.java | 2 +- .../RequestExCubeGameReadyAnswer.java | 2 +- .../clientpackets/RequestExFishRanking.java | 2 +- .../RequestExMagicSkillUseGround.java | 2 +- .../RequestExTryToPutEnchantTargetItem.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 +- .../clientpackets/RequestMagicSkillList.java | 2 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 2 +- .../clientpackets/RequestPCCafeCouponUse.java | 2 +- .../clientpackets/RequestPackageSend.java | 6 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../RequestPetitionFeedback.java | 2 +- .../clientpackets/RequestPreviewItem.java | 4 +- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../RequestPrivateStoreSell.java | 2 +- .../clientpackets/RequestRefundItem.java | 2 +- .../RequestReplySurrenderPledgeWar.java | 2 +- .../network/clientpackets/RequestRestart.java | 4 +- .../clientpackets/RequestRestartPoint.java | 12 +- .../clientpackets/RequestSendPost.java | 4 +- .../RequestSetCastleSiegeTime.java | 10 +- .../network/clientpackets/Say2.java | 10 +- .../clientpackets/SendBypassBuildCmd.java | 4 +- .../SendWareHouseDepositList.java | 6 +- .../SendWareHouseWithDrawList.java | 4 +- .../network/clientpackets/UseItem.java | 2 +- .../clientpackets/ValidatePosition.java | 6 +- .../ability/RequestAcquireAbilityList.java | 16 +- .../alchemy/RequestAlchemyConversion.java | 2 +- .../commission/RequestCommissionRegister.java | 2 +- .../RequestCrystallizeEstimate.java | 2 +- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendDel.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 2 +- .../pledgebonus/RequestPledgeBonusReward.java | 2 +- .../primeshop/RequestBRProductList.java | 2 +- .../sayune/RequestFlyMoveStart.java | 4 +- .../shuttle/RequestShuttleGetOn.java | 2 +- .../loginserverpackets/game/BlowFishKey.java | 4 +- .../serverpackets/AbstractHtmlPacket.java | 4 +- .../serverpackets/AbstractMessagePacket.java | 2 +- .../serverpackets/CharSelectionInfo.java | 8 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/IClientOutgoingPacket.java | 2 +- .../PledgeReceiveSubPledgeCreated.java | 2 +- .../serverpackets/RecipeItemMakeInfo.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../gameserver/script/DateRange.java | 4 +- .../gameserver/script/ScriptDocument.java | 8 +- .../security/SecondaryPasswordAuth.java | 20 +- .../taskmanager/AttackStanceTaskManager.java | 4 +- .../l2jmobius/gameserver/util/Broadcast.java | 4 +- .../com/l2jmobius/gameserver/util/Evolve.java | 6 +- .../gameserver/util/FloodProtectorAction.java | 14 +- .../l2jmobius/gameserver/util/GMAudit.java | 4 +- .../gameserver/util/OfflineTradeUtil.java | 4 +- .../loginserver/FloodProtectedListener.java | 12 +- .../loginserver/GameServerThread.java | 26 +-- .../l2jmobius/loginserver/L2LoginServer.java | 22 +- .../loginserver/LoginController.java | 28 +-- .../network/L2JGameServerPacketHandler.java | 8 +- .../loginserver/network/L2LoginClient.java | 4 +- .../clientpackets/RequestAuthLogin.java | 6 +- .../gameserverpackets/BlowFishKey.java | 4 +- .../gameserverpackets/ChangeAccessLevel.java | 4 +- .../gameserverpackets/ChangePassword.java | 6 +- .../gameserverpackets/GameServerAuth.java | 2 +- .../gameserverpackets/PlayerLogout.java | 2 +- .../gameserverpackets/PlayerTracert.java | 2 +- .../gameserverpackets/RequestTempBan.java | 4 +- .../gameserverpackets/ServerStatus.java | 2 +- .../network/serverpackets/ServerList.java | 4 +- .../loginserver/network/util/IPv4Filter.java | 4 +- .../game/data/scripts/ai/AbstractNpcAI.java | 2 +- .../ai/areas/CrumaTower/CrumaTower.java | 2 +- .../ai/areas/DenOfDevil/DenOfEvil.java | 4 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 4 +- .../EnchantedMegaliths.java | 2 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 6 +- .../scripts/ai/bosses/Antharas/Antharas.java | 2 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 4 +- .../scripts/ai/bosses/Sailren/Sailren.java | 2 +- .../data/scripts/ai/bosses/Tiat/Stage1.java | 7 +- .../CastleAmbassador/CastleAmbassador.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ManorManager/ManorManager.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 6 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../custom/events/Rabbits/Rabbits.java | 2 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../custom/listeners/ListenerTest.java | 14 +- .../data/scripts/handlers/MasterHandler.java | 12 +- .../L2StaticObjectInstanceAction.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 4 +- .../admincommandhandlers/AdminEditChar.java | 10 +- .../admincommandhandlers/AdminEnchant.java | 6 +- .../admincommandhandlers/AdminHeal.java | 4 +- .../admincommandhandlers/AdminMenu.java | 10 +- .../admincommandhandlers/AdminPunishment.java | 8 +- .../admincommandhandlers/AdminRepairChar.java | 4 +- .../admincommandhandlers/AdminShop.java | 6 +- .../admincommandhandlers/AdminShowQuests.java | 4 +- .../admincommandhandlers/AdminSkill.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 8 +- .../admincommandhandlers/AdminSummon.java | 6 +- .../admincommandhandlers/AdminTeleport.java | 8 +- .../admincommandhandlers/AdminUnblockIp.java | 4 +- .../admincommandhandlers/AdminZones.java | 4 +- .../handlers/bypasshandlers/Augment.java | 2 +- .../scripts/handlers/bypasshandlers/Buy.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../bypasshandlers/ItemAuctionLink.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +- .../handlers/bypasshandlers/Multisell.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 8 +- .../handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PlayerHelp.java | 2 +- .../bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/Wear.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 6 +- .../handlers/effecthandlers/Disarmor.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 6 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 2 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 2 +- .../itemhandlers/BlessedSpiritShot.java | 2 +- .../handlers/itemhandlers/EventItem.java | 4 +- .../itemhandlers/ExtractableItems.java | 2 +- .../handlers/itemhandlers/FishShots.java | 2 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 2 +- .../usercommandhandlers/ClanWarsList.java | 4 +- .../scripts/instances/AbstractInstance.java | 6 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 2 +- .../scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../Q10814_BefittingOfTheStatus.java | 2 +- .../scripts/quests/QuestMasterHandler.java | 4 +- .../scripts/vehicles/AirShipController.java | 18 +- .../data/scripts/vehicles/BoatGludinRune.java | 4 +- .../scripts/vehicles/BoatInnadrilTour.java | 4 +- .../scripts/vehicles/BoatRunePrimeval.java | 4 +- .../commons/network/BaseRecievePacket.java | 4 +- .../commons/network/BaseSendablePacket.java | 6 +- .../commons/util/crypt/ScrambledKeyPair.java | 4 +- .../Manager/ForumsBBSManager.java | 6 +- .../data/sql/impl/CharNameTable.java | 20 +- .../gameserver/engines/DocumentBase.java | 22 +- .../engines/items/DocumentItem.java | 5 +- .../gameserver/geoengine/GeoEngine.java | 18 +- .../geoengine/GeoEnginePathfinding.java | 6 +- .../gameserver/handler/IActionHandler.java | 2 +- .../handler/IActionShiftHandler.java | 2 +- .../gameserver/handler/IBypassHandler.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../handler/IPunishmentHandler.java | 2 +- .../handler/IUserCommandHandler.java | 2 +- .../instancemanager/CommissionManager.java | 10 +- .../instancemanager/FactionManager.java | 8 +- .../instancemanager/FortManager.java | 6 +- .../instancemanager/FortSiegeManager.java | 10 +- .../instancemanager/GraciaSeedsManager.java | 12 +- .../instancemanager/GrandBossManager.java | 20 +- .../instancemanager/ItemsOnGroundManager.java | 14 +- .../instancemanager/MentorManager.java | 8 +- .../instancemanager/PetitionManager.java | 6 +- .../instancemanager/ServerRestartManager.java | 6 +- .../instancemanager/SiegeManager.java | 10 +- .../tasks/MessageDeletionTask.java | 4 +- .../l2jmobius/gameserver/model/BlockList.java | 6 +- .../gameserver/model/CharEffectList.java | 4 +- .../gameserver/model/CursedWeapon.java | 16 +- .../l2jmobius/gameserver/model/L2Clan.java | 62 +++--- .../l2jmobius/gameserver/model/L2Mentee.java | 4 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +- .../gameserver/model/L2Territory.java | 4 +- .../l2jmobius/gameserver/model/MacroList.java | 8 +- .../l2jmobius/gameserver/model/ShortCuts.java | 8 +- .../l2jmobius/gameserver/model/TradeList.java | 38 ++-- .../gameserver/model/actor/L2Attackable.java | 6 +- .../gameserver/model/actor/L2Character.java | 4 +- .../gameserver/model/actor/L2Npc.java | 6 +- .../gameserver/model/actor/L2Vehicle.java | 6 +- .../instance/L2ControlTowerInstance.java | 2 +- .../model/actor/instance/L2DecoyInstance.java | 4 +- .../actor/instance/L2DefenderInstance.java | 2 +- .../model/actor/instance/L2DoorInstance.java | 2 +- .../actor/instance/L2MerchantInstance.java | 4 +- .../model/actor/instance/L2PcInstance.java | 194 ++++++++--------- .../model/actor/instance/L2PetInstance.java | 10 +- .../actor/instance/L2ServitorInstance.java | 4 +- .../instance/L2VillageMasterInstance.java | 4 +- .../gameserver/model/actor/stat/PetStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 4 +- .../model/actor/status/CharStatus.java | 4 +- .../actor/tasks/npc/RandomAnimationTask.java | 4 +- .../model/actor/tasks/npc/trap/TrapTask.java | 4 +- .../tasks/player/GameGuardCheckTask.java | 4 +- .../tasks/player/IllegalPlayerActionTask.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 4 +- .../model/announce/Announcement.java | 8 +- .../model/announce/AnnouncementType.java | 6 +- .../model/announce/AutoAnnouncement.java | 4 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/effects/AbstractEffect.java | 2 +- .../model/entity/BlockCheckerEngine.java | 14 +- .../gameserver/model/entity/Castle.java | 36 ++-- .../gameserver/model/entity/Couple.java | 10 +- .../gameserver/model/entity/Duel.java | 10 +- .../gameserver/model/entity/Fort.java | 36 ++-- .../gameserver/model/entity/FortSiege.java | 38 ++-- .../gameserver/model/entity/L2Event.java | 12 +- .../gameserver/model/entity/Siege.java | 24 +-- .../model/events/AbstractScript.java | 66 +++--- .../model/events/EventDispatcher.java | 8 +- .../listeners/AnnotationEventListener.java | 4 +- .../listeners/FunctionEventListener.java | 4 +- .../model/itemcontainer/ItemContainer.java | 6 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PcInventory.java | 6 +- .../model/itemcontainer/PcRefund.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 2 +- .../model/items/enchant/EnchantItemGroup.java | 6 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../model/items/instance/L2ItemInstance.java | 4 +- .../model/olympiad/AbstractOlympiadGame.java | 12 +- .../model/olympiad/OlympiadGameManager.java | 6 +- .../model/olympiad/OlympiadGameNormal.java | 14 +- .../model/olympiad/OlympiadGameTask.java | 32 +-- .../model/punishment/PunishmentTask.java | 6 +- .../gameserver/model/quest/LongTimeEvent.java | 20 +- .../gameserver/model/quest/Quest.java | 42 ++-- .../gameserver/model/quest/QuestState.java | 6 +- .../gameserver/model/quest/QuestTimer.java | 4 +- .../model/shuttle/L2ShuttleEngine.java | 4 +- .../gameserver/model/skills/Skill.java | 14 +- .../model/skills/SkillChannelizer.java | 10 +- .../model/variables/AccountVariables.java | 8 +- .../model/variables/ClanVariables.java | 8 +- .../model/variables/ItemVariables.java | 10 +- .../model/variables/PlayerVariables.java | 8 +- .../gameserver/model/zone/L2ZoneRespawn.java | 2 +- .../gameserver/model/zone/L2ZoneType.java | 4 +- .../model/zone/type/L2EffectZone.java | 4 +- .../gameserver/network/L2GameClient.java | 10 +- .../gameserver/network/NpcStringId.java | 4 +- .../network/clientpackets/Action.java | 2 +- .../network/clientpackets/AddTradeItem.java | 4 +- .../clientpackets/CharacterCreate.java | 12 +- .../clientpackets/CharacterDelete.java | 2 +- .../clientpackets/CharacterSelect.java | 4 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 4 +- .../network/clientpackets/ExGetOnAirShip.java | 8 +- .../network/clientpackets/GameGuardReply.java | 2 +- .../clientpackets/IClientIncomingPacket.java | 2 +- .../network/clientpackets/Logout.java | 4 +- .../clientpackets/MultiSellChoose.java | 14 +- .../clientpackets/ProtocolVersion.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 8 +- .../RequestAcquireSkillInfo.java | 8 +- .../clientpackets/RequestActionUse.java | 4 +- .../network/clientpackets/RequestBlock.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../clientpackets/RequestBypassToServer.java | 10 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 2 +- .../clientpackets/RequestExChangeName.java | 2 +- .../RequestExCubeGameChangeTeam.java | 2 +- .../RequestExCubeGameReadyAnswer.java | 2 +- .../clientpackets/RequestExFishRanking.java | 2 +- .../RequestExMagicSkillUseGround.java | 2 +- .../RequestExTryToPutEnchantTargetItem.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 +- .../clientpackets/RequestMagicSkillList.java | 2 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 2 +- .../clientpackets/RequestPCCafeCouponUse.java | 2 +- .../clientpackets/RequestPackageSend.java | 6 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../RequestPetitionFeedback.java | 2 +- .../clientpackets/RequestPreviewItem.java | 4 +- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../RequestPrivateStoreSell.java | 2 +- .../clientpackets/RequestRefundItem.java | 2 +- .../RequestReplySurrenderPledgeWar.java | 2 +- .../network/clientpackets/RequestRestart.java | 4 +- .../clientpackets/RequestRestartPoint.java | 12 +- .../clientpackets/RequestSendPost.java | 4 +- .../RequestSetCastleSiegeTime.java | 10 +- .../network/clientpackets/Say2.java | 10 +- .../clientpackets/SendBypassBuildCmd.java | 4 +- .../SendWareHouseDepositList.java | 6 +- .../SendWareHouseWithDrawList.java | 4 +- .../network/clientpackets/UseItem.java | 2 +- .../clientpackets/ValidatePosition.java | 6 +- .../ability/RequestAcquireAbilityList.java | 16 +- .../alchemy/RequestAlchemyConversion.java | 2 +- .../commission/RequestCommissionRegister.java | 2 +- .../RequestCrystallizeEstimate.java | 2 +- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendDel.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 2 +- .../pledgebonus/RequestPledgeBonusReward.java | 2 +- .../primeshop/RequestBRProductList.java | 2 +- .../sayune/RequestFlyMoveStart.java | 4 +- .../shuttle/RequestShuttleGetOn.java | 2 +- .../loginserverpackets/game/BlowFishKey.java | 4 +- .../serverpackets/AbstractHtmlPacket.java | 4 +- .../serverpackets/AbstractMessagePacket.java | 2 +- .../serverpackets/CharSelectionInfo.java | 8 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/IClientOutgoingPacket.java | 2 +- .../PledgeReceiveSubPledgeCreated.java | 2 +- .../serverpackets/RecipeItemMakeInfo.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../gameserver/script/DateRange.java | 4 +- .../gameserver/script/ScriptDocument.java | 8 +- .../security/SecondaryPasswordAuth.java | 20 +- .../taskmanager/AttackStanceTaskManager.java | 4 +- .../l2jmobius/gameserver/util/Broadcast.java | 4 +- .../com/l2jmobius/gameserver/util/Evolve.java | 6 +- .../gameserver/util/FloodProtectorAction.java | 14 +- .../l2jmobius/gameserver/util/GMAudit.java | 4 +- .../gameserver/util/OfflineTradeUtil.java | 4 +- .../loginserver/FloodProtectedListener.java | 12 +- .../loginserver/GameServerThread.java | 26 +-- .../l2jmobius/loginserver/L2LoginServer.java | 22 +- .../loginserver/LoginController.java | 28 +-- .../network/L2JGameServerPacketHandler.java | 8 +- .../loginserver/network/L2LoginClient.java | 4 +- .../clientpackets/RequestAuthLogin.java | 6 +- .../gameserverpackets/BlowFishKey.java | 4 +- .../gameserverpackets/ChangeAccessLevel.java | 4 +- .../gameserverpackets/ChangePassword.java | 6 +- .../gameserverpackets/GameServerAuth.java | 2 +- .../gameserverpackets/PlayerLogout.java | 2 +- .../gameserverpackets/PlayerTracert.java | 2 +- .../gameserverpackets/RequestTempBan.java | 4 +- .../gameserverpackets/ServerStatus.java | 2 +- .../network/serverpackets/ServerList.java | 4 +- .../loginserver/network/util/IPv4Filter.java | 4 +- .../scripts/ai/areas/DenOfEvil/DenOfEvil.java | 4 +- .../FantasyIsle/HandysBlockCheckerEvent.java | 4 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 4 +- .../scripts/ai/areas/Gracia/GraciaLoader.java | 6 +- .../HallOfErosionAttack.java | 2 +- .../HallOfErosionDefence.java | 2 +- .../HallOfSufferingAttack.java | 2 +- .../HallOfSufferingDefence.java | 2 +- .../HeartInfinityAttack.java | 2 +- .../HeartInfinityDefence.java | 2 +- .../SeedOfDestruction/SeedOfDestruction.java | 8 +- .../Gracia/vehicles/AirShipController.java | 18 +- .../ai/areas/Hellbound/HellboundEngine.java | 16 +- .../ai/areas/Hellbound/HellboundLoader.java | 6 +- .../scripts/ai/bosses/Antharas/Antharas.java | 2 +- .../scripts/ai/bosses/Sailren/Sailren.java | 2 +- .../scripts/ai/others/AltarsOfSacrifice.java | 4 +- .../ai/others/AvantGarde/AvantGarde.java | 10 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ManorManager/ManorManager.java | 2 +- .../MercenaryCaptain/MercenaryCaptain.java | 2 +- .../data/scripts/ai/others/Selina/Selina.java | 2 +- .../FortressOfResistance.java | 2 +- .../RainbowSpringsChateau.java | 4 +- .../conquerablehalls/flagwar/FlagWar.java | 24 +-- .../scripts/custom/NpcBuffer/NpcBuffer.java | 2 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../custom/events/Rabbits/Rabbits.java | 2 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../scripts/handlers/EffectMasterHandler.java | 6 +- .../data/scripts/handlers/MasterHandler.java | 12 +- .../L2StaticObjectInstanceAction.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 4 +- .../admincommandhandlers/AdminEditChar.java | 10 +- .../admincommandhandlers/AdminEnchant.java | 6 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminGm.java | 4 +- .../admincommandhandlers/AdminHeal.java | 4 +- .../admincommandhandlers/AdminMenu.java | 10 +- .../AdminMonsterRace.java | 4 +- .../admincommandhandlers/AdminPunishment.java | 8 +- .../admincommandhandlers/AdminRepairChar.java | 4 +- .../admincommandhandlers/AdminShop.java | 6 +- .../admincommandhandlers/AdminShowQuests.java | 4 +- .../admincommandhandlers/AdminSkill.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 8 +- .../admincommandhandlers/AdminSummon.java | 6 +- .../admincommandhandlers/AdminTeleport.java | 6 +- .../admincommandhandlers/AdminUnblockIp.java | 4 +- .../admincommandhandlers/AdminZones.java | 4 +- .../handlers/bypasshandlers/Augment.java | 2 +- .../scripts/handlers/bypasshandlers/Buy.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/bypasshandlers/Festival.java | 2 +- .../bypasshandlers/ItemAuctionLink.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +- .../handlers/bypasshandlers/Multisell.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 8 +- .../handlers/bypasshandlers/Observation.java | 2 +- .../bypasshandlers/OlympiadManagerLink.java | 12 +- .../bypasshandlers/OlympiadObservation.java | 2 +- .../handlers/bypasshandlers/PlayerHelp.java | 2 +- .../bypasshandlers/PrivateWarehouse.java | 2 +- .../handlers/bypasshandlers/QuestLink.java | 4 +- .../handlers/bypasshandlers/RentPet.java | 2 +- .../scripts/handlers/bypasshandlers/Rift.java | 2 +- .../handlers/bypasshandlers/SkillList.java | 2 +- .../scripts/handlers/bypasshandlers/Wear.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 6 +- .../handlers/effecthandlers/EnemyCharge.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 6 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/ThrowUp.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 2 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSpiritShot.java | 2 +- .../handlers/itemhandlers/EventItem.java | 4 +- .../itemhandlers/ExtractableItems.java | 2 +- .../handlers/itemhandlers/FishShots.java | 2 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 6 +- .../handlers/itemhandlers/SoulShots.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 2 +- .../usercommandhandlers/ClanWarsList.java | 4 +- .../voicedcommandhandlers/ChangePassword.java | 2 +- .../voicedcommandhandlers/Wedding.java | 8 +- .../scripts/instances/AbstractInstance.java | 2 +- .../instances/ChambersOfDelusion/Chamber.java | 2 +- .../CrystalCaverns/CrystalCaverns.java | 2 +- .../FinalEmperialTomb/FinalEmperialTomb.java | 27 +-- .../scripts/instances/InstanceLoader.java | 6 +- .../scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../NornilsGarden/NornilsGarden.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 24 +-- .../Q00511_AwlUnderFoot.java | 4 +- .../Q00727_HopeWithinTheDarkness.java | 8 +- .../scripts/quests/QuestMasterHandler.java | 4 +- .../TerritoryWarSuperClass.java | 6 +- .../scripts/vehicles/BoatGiranTalking.java | 4 +- .../data/scripts/vehicles/BoatGludinRune.java | 4 +- .../scripts/vehicles/BoatInnadrilTour.java | 4 +- .../scripts/vehicles/BoatRunePrimeval.java | 4 +- .../scripts/vehicles/BoatTalkingGludin.java | 4 +- .../commons/network/BaseRecievePacket.java | 4 +- .../commons/network/BaseSendablePacket.java | 6 +- .../commons/util/crypt/ScrambledKeyPair.java | 4 +- .../com/l2jmobius/gameserver/SevenSigns.java | 40 ++-- .../gameserver/SevenSignsFestival.java | 22 +- .../gameserver/ai/L2AttackableAI.java | 12 +- .../Manager/ForumsBBSManager.java | 6 +- .../data/sql/impl/CharNameTable.java | 14 +- .../gameserver/engines/DocumentBase.java | 24 +-- .../engines/items/DocumentItem.java | 2 +- .../engines/skills/DocumentSkill.java | 22 +- .../gameserver/geoengine/GeoEngine.java | 18 +- .../geoengine/GeoEnginePathfinding.java | 6 +- .../gameserver/handler/IActionHandler.java | 2 +- .../handler/IActionShiftHandler.java | 2 +- .../gameserver/handler/IBypassHandler.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../handler/IPunishmentHandler.java | 2 +- .../gameserver/handler/ITelnetHandler.java | 2 +- .../handler/IUserCommandHandler.java | 2 +- .../handler/IVoicedCommandHandler.java | 2 +- .../instancemanager/AirShipManager.java | 16 +- .../instancemanager/CHSiegeManager.java | 6 +- .../instancemanager/CastleManager.java | 8 +- .../ClanHallAuctionManager.java | 12 +- .../instancemanager/ClanHallManager.java | 8 +- .../instancemanager/CoupleManager.java | 6 +- .../instancemanager/CursedWeaponsManager.java | 20 +- .../instancemanager/DayNightSpawnManager.java | 18 +- .../DimensionalRiftManager.java | 18 +- .../instancemanager/FactionManager.java | 8 +- .../FishingChampionshipManager.java | 8 +- .../instancemanager/FortManager.java | 6 +- .../FortSiegeGuardManager.java | 8 +- .../instancemanager/FortSiegeManager.java | 10 +- .../FourSepulchersManager.java | 60 +++--- .../GlobalVariablesManager.java | 10 +- .../instancemanager/GrandBossManager.java | 24 +-- .../instancemanager/ItemAuctionManager.java | 14 +- .../instancemanager/ItemsOnGroundManager.java | 14 +- .../instancemanager/MailManager.java | 18 +- .../instancemanager/MercTicketManager.java | 6 +- .../instancemanager/PetitionManager.java | 6 +- .../instancemanager/PunishmentManager.java | 6 +- .../RaidBossPointsManager.java | 10 +- .../instancemanager/RaidBossSpawnManager.java | 26 +-- .../instancemanager/ServerRestartManager.java | 6 +- .../instancemanager/SiegeGuardManager.java | 12 +- .../instancemanager/SiegeManager.java | 10 +- .../instancemanager/SoDManager.java | 14 +- .../instancemanager/SoIManager.java | 10 +- .../instancemanager/TerritoryWarManager.java | 58 +++--- .../instancemanager/games/Lottery.java | 14 +- .../tasks/MessageDeletionTask.java | 4 +- .../gameserver/model/AutoSpawnHandler.java | 14 +- .../l2jmobius/gameserver/model/BlockList.java | 6 +- .../gameserver/model/CharEffectList.java | 4 +- .../gameserver/model/CursedWeapon.java | 16 +- .../gameserver/model/L2Augmentation.java | 4 +- .../l2jmobius/gameserver/model/L2Clan.java | 62 +++--- .../l2jmobius/gameserver/model/L2Party.java | 4 +- .../gameserver/model/L2Territory.java | 4 +- .../l2jmobius/gameserver/model/MacroList.java | 8 +- .../l2jmobius/gameserver/model/ShortCuts.java | 8 +- .../gameserver/model/TerritoryWard.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 36 ++-- .../gameserver/model/UIKeysSettings.java | 10 +- .../gameserver/model/actor/L2Attackable.java | 6 +- .../gameserver/model/actor/L2Character.java | 16 +- .../gameserver/model/actor/L2Npc.java | 8 +- .../gameserver/model/actor/L2Vehicle.java | 6 +- .../actor/instance/L2AuctioneerInstance.java | 10 +- .../instance/L2ClanHallManagerInstance.java | 2 +- .../instance/L2ControlTowerInstance.java | 2 +- .../model/actor/instance/L2CubicInstance.java | 4 +- .../model/actor/instance/L2DecoyInstance.java | 4 +- .../actor/instance/L2DefenderInstance.java | 2 +- .../model/actor/instance/L2DoorInstance.java | 2 +- .../actor/instance/L2DoormenInstance.java | 2 +- .../instance/L2DungeonGatekeeperInstance.java | 2 +- .../actor/instance/L2FortManagerInstance.java | 4 +- .../actor/instance/L2MerchantInstance.java | 4 +- .../actor/instance/L2NpcBufferInstance.java | 6 +- .../model/actor/instance/L2PcInstance.java | 184 ++++++++-------- .../model/actor/instance/L2PetInstance.java | 10 +- .../actor/instance/L2RaceManagerInstance.java | 12 +- .../instance/L2SepulcherNpcInstance.java | 2 +- .../actor/instance/L2ServitorInstance.java | 4 +- .../actor/instance/L2SignsPriestInstance.java | 8 +- .../actor/instance/L2TeleporterInstance.java | 2 +- .../instance/L2TerritoryWardInstance.java | 2 +- .../instance/L2VillageMasterInstance.java | 12 +- .../gameserver/model/actor/stat/PetStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 4 +- .../model/actor/status/CharStatus.java | 4 +- .../model/actor/tasks/cubics/CubicAction.java | 4 +- .../model/actor/tasks/cubics/CubicHeal.java | 4 +- .../model/actor/tasks/npc/trap/TrapTask.java | 4 +- .../tasks/player/GameGuardCheckTask.java | 4 +- .../tasks/player/IllegalPlayerActionTask.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 4 +- .../model/announce/Announcement.java | 8 +- .../model/announce/AnnouncementType.java | 6 +- .../model/announce/AutoAnnouncement.java | 4 +- .../gameserver/model/buylist/Product.java | 4 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../model/effects/AbstractEffect.java | 8 +- .../gameserver/model/entity/Auction.java | 24 +-- .../model/entity/BlockCheckerEngine.java | 14 +- .../gameserver/model/entity/Castle.java | 38 ++-- .../gameserver/model/entity/ClanHall.java | 12 +- .../gameserver/model/entity/Couple.java | 10 +- .../gameserver/model/entity/Duel.java | 10 +- .../gameserver/model/entity/Fort.java | 36 ++-- .../gameserver/model/entity/FortSiege.java | 32 +-- .../gameserver/model/entity/Hero.java | 26 +-- .../gameserver/model/entity/L2Event.java | 12 +- .../gameserver/model/entity/Siege.java | 24 +-- .../gameserver/model/entity/TvTEvent.java | 6 +- .../gameserver/model/entity/TvTManager.java | 12 +- .../entity/clanhall/AuctionableHall.java | 6 +- .../entity/clanhall/ClanHallSiegeEngine.java | 14 +- .../model/entity/clanhall/SiegableHall.java | 6 +- .../model/events/AbstractScript.java | 64 +++--- .../model/events/EventDispatcher.java | 8 +- .../listeners/AnnotationEventListener.java | 4 +- .../listeners/FunctionEventListener.java | 4 +- .../model/itemauction/ItemAuction.java | 6 +- .../itemauction/ItemAuctionInstance.java | 34 +-- .../model/itemcontainer/Inventory.java | 28 +-- .../model/itemcontainer/ItemContainer.java | 6 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PcInventory.java | 6 +- .../model/itemcontainer/PcRefund.java | 4 +- .../model/itemcontainer/PcWarehouse.java | 2 +- .../gameserver/model/items/L2Armor.java | 2 +- .../gameserver/model/items/L2EtcItem.java | 6 +- .../gameserver/model/items/L2Item.java | 10 +- .../gameserver/model/items/L2Weapon.java | 6 +- .../items/enchant/AbstractEnchantItem.java | 2 +- .../model/items/enchant/EnchantItemGroup.java | 6 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../model/items/instance/L2ItemInstance.java | 40 ++-- .../model/olympiad/AbstractOlympiadGame.java | 12 +- .../gameserver/model/olympiad/Olympiad.java | 58 +++--- .../model/olympiad/OlympiadGameManager.java | 6 +- .../model/olympiad/OlympiadGameNormal.java | 16 +- .../model/olympiad/OlympiadGameTask.java | 34 +-- .../model/olympiad/OlympiadGameTeams.java | 10 +- .../model/punishment/PunishmentTask.java | 6 +- .../gameserver/model/quest/LongTimeEvent.java | 20 +- .../gameserver/model/quest/Quest.java | 38 ++-- .../gameserver/model/quest/QuestState.java | 8 +- .../gameserver/model/quest/QuestTimer.java | 4 +- .../gameserver/model/skills/Skill.java | 16 +- .../model/skills/SkillChannelizer.java | 12 +- .../gameserver/model/stats/BaseStats.java | 8 +- .../model/variables/AccountVariables.java | 6 +- .../model/variables/PlayerVariables.java | 6 +- .../gameserver/model/zone/L2ZoneRespawn.java | 2 +- .../gameserver/model/zone/L2ZoneType.java | 4 +- .../model/zone/type/L2ClanHallZone.java | 2 +- .../model/zone/type/L2EffectZone.java | 4 +- .../model/zone/type/L2SiegeZone.java | 2 +- .../gameserver/network/L2GameClient.java | 10 +- .../gameserver/network/NpcStringId.java | 16 +- .../gameserver/network/SystemMessageId.java | 16 +- .../network/clientpackets/Action.java | 2 +- .../network/clientpackets/AddTradeItem.java | 4 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 14 +- .../clientpackets/CharacterDelete.java | 2 +- .../clientpackets/CharacterSelect.java | 4 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 4 +- .../network/clientpackets/ExGetOnAirShip.java | 8 +- .../network/clientpackets/GameGuardReply.java | 2 +- .../clientpackets/IClientIncomingPacket.java | 2 +- .../network/clientpackets/Logout.java | 6 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/ProtocolVersion.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 14 +- .../RequestAcquireSkillInfo.java | 8 +- .../clientpackets/RequestActionUse.java | 2 +- .../RequestAnswerFriendInvite.java | 2 +- .../network/clientpackets/RequestBlock.java | 2 +- .../clientpackets/RequestBrBuyProduct.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../clientpackets/RequestBypassToServer.java | 14 +- .../clientpackets/RequestCrystallizeItem.java | 6 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 2 +- .../clientpackets/RequestExChangeName.java | 2 +- .../RequestExCubeGameChangeTeam.java | 2 +- .../RequestExCubeGameReadyAnswer.java | 2 +- .../RequestExMagicSkillUseGround.java | 2 +- .../RequestExTryToPutEnchantTargetItem.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../clientpackets/RequestFriendDel.java | 2 +- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 2 +- .../clientpackets/RequestPCCafeCouponUse.java | 2 +- .../clientpackets/RequestPackageSend.java | 6 +- .../clientpackets/RequestPartyMatchList.java | 4 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../RequestPetitionFeedback.java | 2 +- .../RequestPledgeMemberInfo.java | 4 +- .../RequestPledgeMemberPowerInfo.java | 4 +- .../clientpackets/RequestPledgeWarList.java | 4 +- .../clientpackets/RequestPreviewItem.java | 4 +- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../RequestPrivateStoreSell.java | 2 +- .../clientpackets/RequestRefundItem.java | 2 +- .../RequestReplySurrenderPledgeWar.java | 2 +- .../network/clientpackets/RequestRestart.java | 6 +- .../clientpackets/RequestRestartPoint.java | 12 +- .../clientpackets/RequestSendPost.java | 4 +- .../RequestSetCastleSiegeTime.java | 10 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../RequestSurrenderPledgeWar.java | 2 +- .../network/clientpackets/Say2.java | 12 +- .../clientpackets/SendBypassBuildCmd.java | 4 +- .../SendWareHouseDepositList.java | 6 +- .../SendWareHouseWithDrawList.java | 4 +- .../network/clientpackets/UseItem.java | 2 +- .../clientpackets/ValidatePosition.java | 6 +- .../loginserverpackets/game/BlowFishKey.java | 4 +- .../serverpackets/AbstractHtmlPacket.java | 4 +- .../serverpackets/AbstractMessagePacket.java | 2 +- .../serverpackets/CharSelectionInfo.java | 8 +- .../serverpackets/ExBrRecentProductList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/IClientOutgoingPacket.java | 2 +- .../PledgeReceiveSubPledgeCreated.java | 2 +- .../serverpackets/RecipeItemMakeInfo.java | 2 +- .../network/serverpackets/SiegeInfo.java | 4 +- .../SortedWareHouseWithdrawalList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../gameserver/script/DateRange.java | 4 +- .../gameserver/script/ScriptDocument.java | 8 +- .../security/SecondaryPasswordAuth.java | 20 +- .../taskmanager/AttackStanceTaskManager.java | 4 +- .../l2jmobius/gameserver/util/Broadcast.java | 4 +- .../com/l2jmobius/gameserver/util/Evolve.java | 6 +- .../gameserver/util/FloodProtectorAction.java | 14 +- .../l2jmobius/gameserver/util/GMAudit.java | 4 +- .../gameserver/util/OfflineTradeUtil.java | 4 +- .../loginserver/FloodProtectedListener.java | 12 +- .../loginserver/GameServerThread.java | 26 +-- .../l2jmobius/loginserver/L2LoginServer.java | 22 +- .../loginserver/LoginController.java | 28 +-- .../network/L2JGameServerPacketHandler.java | 8 +- .../loginserver/network/L2LoginClient.java | 4 +- .../clientpackets/RequestAuthLogin.java | 6 +- .../gameserverpackets/BlowFishKey.java | 4 +- .../gameserverpackets/ChangeAccessLevel.java | 4 +- .../gameserverpackets/ChangePassword.java | 6 +- .../gameserverpackets/GameServerAuth.java | 2 +- .../gameserverpackets/PlayerLogout.java | 2 +- .../gameserverpackets/PlayerTracert.java | 2 +- .../gameserverpackets/RequestTempBan.java | 4 +- .../gameserverpackets/ServerStatus.java | 2 +- .../network/serverpackets/ServerList.java | 4 +- .../loginserver/network/util/IPv4Filter.java | 4 +- .../game/data/scripts/ai/AbstractNpcAI.java | 2 +- .../scripts/ai/bosses/Antharas/Antharas.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 6 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../custom/events/Rabbits/Rabbits.java | 2 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../custom/listeners/ListenerTest.java | 14 +- .../data/scripts/handlers/MasterHandler.java | 12 +- .../L2StaticObjectInstanceAction.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 4 +- .../admincommandhandlers/AdminEditChar.java | 10 +- .../admincommandhandlers/AdminEnchant.java | 6 +- .../admincommandhandlers/AdminHeal.java | 4 +- .../admincommandhandlers/AdminMenu.java | 10 +- .../admincommandhandlers/AdminPunishment.java | 8 +- .../admincommandhandlers/AdminRepairChar.java | 4 +- .../admincommandhandlers/AdminShop.java | 6 +- .../admincommandhandlers/AdminShowQuests.java | 4 +- .../admincommandhandlers/AdminSkill.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 8 +- .../admincommandhandlers/AdminSummon.java | 6 +- .../admincommandhandlers/AdminTeleport.java | 8 +- .../admincommandhandlers/AdminUnblockIp.java | 4 +- .../admincommandhandlers/AdminZones.java | 4 +- .../handlers/bypasshandlers/Augment.java | 2 +- .../scripts/handlers/bypasshandlers/Buy.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../bypasshandlers/ItemAuctionLink.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +- .../handlers/bypasshandlers/Multisell.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 8 +- .../handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PlayerHelp.java | 2 +- .../bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/Wear.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 6 +- .../handlers/effecthandlers/Disarmor.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 6 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 2 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 2 +- .../itemhandlers/BlessedSpiritShot.java | 2 +- .../handlers/itemhandlers/EventItem.java | 4 +- .../itemhandlers/ExtractableItems.java | 2 +- .../handlers/itemhandlers/FishShots.java | 2 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 2 +- .../usercommandhandlers/ClanWarsList.java | 4 +- .../scripts/instances/AbstractInstance.java | 6 +- .../scripts/quests/QuestMasterHandler.java | 4 +- .../commons/network/BaseRecievePacket.java | 4 +- .../commons/network/BaseSendablePacket.java | 6 +- .../commons/util/crypt/ScrambledKeyPair.java | 4 +- .../Manager/ForumsBBSManager.java | 6 +- .../data/sql/impl/CharNameTable.java | 20 +- .../gameserver/engines/DocumentBase.java | 22 +- .../engines/items/DocumentItem.java | 5 +- .../gameserver/geoengine/GeoEngine.java | 18 +- .../geoengine/GeoEnginePathfinding.java | 6 +- .../gameserver/handler/IActionHandler.java | 2 +- .../handler/IActionShiftHandler.java | 2 +- .../gameserver/handler/IBypassHandler.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../handler/IPunishmentHandler.java | 2 +- .../handler/IUserCommandHandler.java | 2 +- .../instancemanager/CommissionManager.java | 10 +- .../instancemanager/FactionManager.java | 8 +- .../instancemanager/FortManager.java | 6 +- .../instancemanager/FortSiegeManager.java | 10 +- .../instancemanager/GraciaSeedsManager.java | 12 +- .../instancemanager/GrandBossManager.java | 20 +- .../instancemanager/ItemsOnGroundManager.java | 14 +- .../instancemanager/MentorManager.java | 8 +- .../instancemanager/PetitionManager.java | 6 +- .../instancemanager/ServerRestartManager.java | 6 +- .../instancemanager/SiegeManager.java | 10 +- .../tasks/MessageDeletionTask.java | 4 +- .../l2jmobius/gameserver/model/BlockList.java | 6 +- .../gameserver/model/CharEffectList.java | 4 +- .../gameserver/model/CursedWeapon.java | 16 +- .../l2jmobius/gameserver/model/L2Clan.java | 62 +++--- .../l2jmobius/gameserver/model/L2Mentee.java | 4 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +- .../gameserver/model/L2Territory.java | 4 +- .../l2jmobius/gameserver/model/MacroList.java | 8 +- .../l2jmobius/gameserver/model/ShortCuts.java | 8 +- .../l2jmobius/gameserver/model/TradeList.java | 38 ++-- .../gameserver/model/actor/L2Attackable.java | 6 +- .../gameserver/model/actor/L2Character.java | 4 +- .../gameserver/model/actor/L2Npc.java | 6 +- .../gameserver/model/actor/L2Vehicle.java | 6 +- .../instance/L2ControlTowerInstance.java | 2 +- .../model/actor/instance/L2DecoyInstance.java | 4 +- .../actor/instance/L2DefenderInstance.java | 2 +- .../model/actor/instance/L2DoorInstance.java | 2 +- .../actor/instance/L2MerchantInstance.java | 4 +- .../model/actor/instance/L2PcInstance.java | 194 ++++++++--------- .../model/actor/instance/L2PetInstance.java | 10 +- .../actor/instance/L2ServitorInstance.java | 4 +- .../instance/L2VillageMasterInstance.java | 12 +- .../gameserver/model/actor/stat/PetStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 4 +- .../model/actor/status/CharStatus.java | 4 +- .../actor/tasks/npc/RandomAnimationTask.java | 4 +- .../model/actor/tasks/npc/trap/TrapTask.java | 4 +- .../tasks/player/GameGuardCheckTask.java | 4 +- .../tasks/player/IllegalPlayerActionTask.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 4 +- .../model/announce/Announcement.java | 8 +- .../model/announce/AnnouncementType.java | 6 +- .../model/announce/AutoAnnouncement.java | 4 +- .../gameserver/model/buylist/Product.java | 4 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../model/entity/BlockCheckerEngine.java | 14 +- .../gameserver/model/entity/Castle.java | 36 ++-- .../gameserver/model/entity/Couple.java | 10 +- .../gameserver/model/entity/Duel.java | 10 +- .../gameserver/model/entity/Fort.java | 36 ++-- .../gameserver/model/entity/FortSiege.java | 38 ++-- .../gameserver/model/entity/L2Event.java | 12 +- .../gameserver/model/entity/Siege.java | 24 +-- .../model/events/AbstractScript.java | 66 +++--- .../model/events/EventDispatcher.java | 8 +- .../listeners/AnnotationEventListener.java | 4 +- .../listeners/FunctionEventListener.java | 4 +- .../model/itemcontainer/ItemContainer.java | 6 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PcInventory.java | 6 +- .../model/itemcontainer/PcRefund.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 2 +- .../model/items/enchant/EnchantItemGroup.java | 6 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../model/items/instance/L2ItemInstance.java | 4 +- .../model/olympiad/AbstractOlympiadGame.java | 12 +- .../model/olympiad/OlympiadGameManager.java | 6 +- .../model/olympiad/OlympiadGameNormal.java | 14 +- .../model/olympiad/OlympiadGameTask.java | 32 +-- .../model/punishment/PunishmentTask.java | 6 +- .../gameserver/model/quest/LongTimeEvent.java | 20 +- .../gameserver/model/quest/Quest.java | 42 ++-- .../gameserver/model/quest/QuestState.java | 6 +- .../gameserver/model/quest/QuestTimer.java | 4 +- .../model/shuttle/L2ShuttleEngine.java | 4 +- .../gameserver/model/skills/Skill.java | 14 +- .../model/skills/SkillChannelizer.java | 10 +- .../model/variables/AccountVariables.java | 8 +- .../model/variables/ClanVariables.java | 8 +- .../model/variables/ItemVariables.java | 10 +- .../model/variables/PlayerVariables.java | 8 +- .../gameserver/model/zone/L2ZoneRespawn.java | 2 +- .../gameserver/model/zone/L2ZoneType.java | 4 +- .../model/zone/type/L2EffectZone.java | 4 +- .../gameserver/network/L2GameClient.java | 10 +- .../gameserver/network/NpcStringId.java | 4 +- .../network/clientpackets/Action.java | 2 +- .../network/clientpackets/AddTradeItem.java | 4 +- .../clientpackets/CharacterCreate.java | 12 +- .../clientpackets/CharacterDelete.java | 2 +- .../clientpackets/CharacterSelect.java | 4 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 4 +- .../network/clientpackets/ExGetOnAirShip.java | 8 +- .../network/clientpackets/GameGuardReply.java | 2 +- .../clientpackets/IClientIncomingPacket.java | 2 +- .../network/clientpackets/Logout.java | 4 +- .../clientpackets/MultiSellChoose.java | 14 +- .../clientpackets/ProtocolVersion.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 8 +- .../RequestAcquireSkillInfo.java | 8 +- .../clientpackets/RequestActionUse.java | 4 +- .../network/clientpackets/RequestBlock.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../clientpackets/RequestBypassToServer.java | 10 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 2 +- .../clientpackets/RequestExChangeName.java | 2 +- .../RequestExCubeGameChangeTeam.java | 2 +- .../RequestExCubeGameReadyAnswer.java | 2 +- .../clientpackets/RequestExFishRanking.java | 2 +- .../RequestExMagicSkillUseGround.java | 2 +- .../RequestExTryToPutEnchantTargetItem.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 +- .../clientpackets/RequestMagicSkillList.java | 2 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 2 +- .../clientpackets/RequestPCCafeCouponUse.java | 2 +- .../clientpackets/RequestPackageSend.java | 6 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../RequestPetitionFeedback.java | 2 +- .../clientpackets/RequestPreviewItem.java | 4 +- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../RequestPrivateStoreSell.java | 2 +- .../clientpackets/RequestRefundItem.java | 2 +- .../RequestReplySurrenderPledgeWar.java | 2 +- .../network/clientpackets/RequestRestart.java | 4 +- .../clientpackets/RequestRestartPoint.java | 12 +- .../clientpackets/RequestSendPost.java | 4 +- .../RequestSetCastleSiegeTime.java | 10 +- .../network/clientpackets/Say2.java | 10 +- .../clientpackets/SendBypassBuildCmd.java | 4 +- .../SendWareHouseDepositList.java | 6 +- .../SendWareHouseWithDrawList.java | 4 +- .../network/clientpackets/UseItem.java | 2 +- .../clientpackets/ValidatePosition.java | 6 +- .../commission/RequestCommissionRegister.java | 2 +- .../RequestCrystallizeEstimate.java | 2 +- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendDel.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 2 +- .../pledgebonus/RequestPledgeBonusReward.java | 2 +- .../primeshop/RequestBRProductList.java | 2 +- .../sayune/RequestFlyMoveStart.java | 4 +- .../shuttle/RequestShuttleGetOn.java | 2 +- .../loginserverpackets/game/BlowFishKey.java | 4 +- .../serverpackets/AbstractHtmlPacket.java | 4 +- .../serverpackets/AbstractMessagePacket.java | 2 +- .../serverpackets/CharSelectionInfo.java | 8 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/IClientOutgoingPacket.java | 2 +- .../PledgeReceiveSubPledgeCreated.java | 2 +- .../serverpackets/RecipeItemMakeInfo.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../gameserver/script/DateRange.java | 4 +- .../gameserver/script/ScriptDocument.java | 8 +- .../security/SecondaryPasswordAuth.java | 20 +- .../taskmanager/AttackStanceTaskManager.java | 4 +- .../l2jmobius/gameserver/util/Broadcast.java | 4 +- .../com/l2jmobius/gameserver/util/Evolve.java | 6 +- .../gameserver/util/FloodProtectorAction.java | 14 +- .../l2jmobius/gameserver/util/GMAudit.java | 4 +- .../gameserver/util/OfflineTradeUtil.java | 4 +- .../loginserver/FloodProtectedListener.java | 12 +- .../loginserver/GameServerThread.java | 26 +-- .../l2jmobius/loginserver/L2LoginServer.java | 22 +- .../loginserver/LoginController.java | 28 +-- .../network/L2JGameServerPacketHandler.java | 8 +- .../loginserver/network/L2LoginClient.java | 4 +- .../clientpackets/RequestAuthLogin.java | 6 +- .../gameserverpackets/BlowFishKey.java | 4 +- .../gameserverpackets/ChangeAccessLevel.java | 4 +- .../gameserverpackets/ChangePassword.java | 6 +- .../gameserverpackets/GameServerAuth.java | 2 +- .../gameserverpackets/PlayerLogout.java | 2 +- .../gameserverpackets/PlayerTracert.java | 2 +- .../gameserverpackets/RequestTempBan.java | 4 +- .../gameserverpackets/ServerStatus.java | 2 +- .../network/serverpackets/ServerList.java | 4 +- .../loginserver/network/util/IPv4Filter.java | 4 +- .../game/data/scripts/ai/AbstractNpcAI.java | 2 +- .../scripts/ai/bosses/Antharas/Antharas.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 6 +- .../scripts/custom/events/Elpies/Elpies.java | 2 +- .../custom/events/Rabbits/Rabbits.java | 2 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../custom/listeners/ListenerTest.java | 14 +- .../data/scripts/handlers/MasterHandler.java | 12 +- .../L2StaticObjectInstanceAction.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 4 +- .../admincommandhandlers/AdminEditChar.java | 10 +- .../admincommandhandlers/AdminEnchant.java | 6 +- .../admincommandhandlers/AdminHeal.java | 4 +- .../admincommandhandlers/AdminMenu.java | 10 +- .../admincommandhandlers/AdminPunishment.java | 8 +- .../admincommandhandlers/AdminRepairChar.java | 4 +- .../admincommandhandlers/AdminShop.java | 6 +- .../admincommandhandlers/AdminShowQuests.java | 4 +- .../admincommandhandlers/AdminSkill.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 8 +- .../admincommandhandlers/AdminSummon.java | 6 +- .../admincommandhandlers/AdminTeleport.java | 8 +- .../admincommandhandlers/AdminUnblockIp.java | 4 +- .../admincommandhandlers/AdminZones.java | 4 +- .../handlers/bypasshandlers/Augment.java | 2 +- .../scripts/handlers/bypasshandlers/Buy.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../bypasshandlers/ItemAuctionLink.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +- .../handlers/bypasshandlers/Multisell.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 8 +- .../handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PlayerHelp.java | 2 +- .../bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/Wear.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 6 +- .../handlers/effecthandlers/Disarmor.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 6 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 2 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 2 +- .../itemhandlers/BlessedSpiritShot.java | 2 +- .../handlers/itemhandlers/EventItem.java | 4 +- .../itemhandlers/ExtractableItems.java | 2 +- .../handlers/itemhandlers/FishShots.java | 2 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 2 +- .../usercommandhandlers/ClanWarsList.java | 4 +- .../scripts/instances/AbstractInstance.java | 6 +- .../scripts/quests/QuestMasterHandler.java | 4 +- .../commons/network/BaseRecievePacket.java | 4 +- .../commons/network/BaseSendablePacket.java | 6 +- .../commons/util/crypt/ScrambledKeyPair.java | 4 +- .../Manager/ForumsBBSManager.java | 6 +- .../data/sql/impl/CharNameTable.java | 20 +- .../gameserver/engines/DocumentBase.java | 22 +- .../engines/items/DocumentItem.java | 5 +- .../gameserver/geoengine/GeoEngine.java | 18 +- .../geoengine/GeoEnginePathfinding.java | 6 +- .../gameserver/handler/IActionHandler.java | 2 +- .../handler/IActionShiftHandler.java | 2 +- .../gameserver/handler/IBypassHandler.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../handler/IPunishmentHandler.java | 2 +- .../handler/IUserCommandHandler.java | 2 +- .../instancemanager/CommissionManager.java | 10 +- .../instancemanager/FactionManager.java | 8 +- .../instancemanager/FortManager.java | 6 +- .../instancemanager/FortSiegeManager.java | 10 +- .../instancemanager/GraciaSeedsManager.java | 12 +- .../instancemanager/GrandBossManager.java | 20 +- .../instancemanager/ItemsOnGroundManager.java | 14 +- .../instancemanager/MentorManager.java | 8 +- .../instancemanager/PetitionManager.java | 6 +- .../instancemanager/ServerRestartManager.java | 6 +- .../instancemanager/SiegeManager.java | 10 +- .../tasks/MessageDeletionTask.java | 4 +- .../l2jmobius/gameserver/model/BlockList.java | 6 +- .../gameserver/model/CharEffectList.java | 4 +- .../gameserver/model/CursedWeapon.java | 16 +- .../l2jmobius/gameserver/model/L2Clan.java | 62 +++--- .../l2jmobius/gameserver/model/L2Mentee.java | 4 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +- .../gameserver/model/L2Territory.java | 4 +- .../l2jmobius/gameserver/model/MacroList.java | 8 +- .../l2jmobius/gameserver/model/ShortCuts.java | 8 +- .../l2jmobius/gameserver/model/TradeList.java | 38 ++-- .../gameserver/model/actor/L2Attackable.java | 6 +- .../gameserver/model/actor/L2Character.java | 4 +- .../gameserver/model/actor/L2Npc.java | 6 +- .../gameserver/model/actor/L2Vehicle.java | 6 +- .../instance/L2ControlTowerInstance.java | 2 +- .../model/actor/instance/L2DecoyInstance.java | 4 +- .../actor/instance/L2DefenderInstance.java | 2 +- .../model/actor/instance/L2DoorInstance.java | 2 +- .../actor/instance/L2MerchantInstance.java | 4 +- .../model/actor/instance/L2PcInstance.java | 194 ++++++++--------- .../model/actor/instance/L2PetInstance.java | 10 +- .../actor/instance/L2ServitorInstance.java | 4 +- .../instance/L2VillageMasterInstance.java | 12 +- .../gameserver/model/actor/stat/PetStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 4 +- .../model/actor/status/CharStatus.java | 4 +- .../actor/tasks/npc/RandomAnimationTask.java | 4 +- .../model/actor/tasks/npc/trap/TrapTask.java | 4 +- .../tasks/player/GameGuardCheckTask.java | 4 +- .../tasks/player/IllegalPlayerActionTask.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 4 +- .../model/announce/Announcement.java | 8 +- .../model/announce/AnnouncementType.java | 6 +- .../model/announce/AutoAnnouncement.java | 4 +- .../gameserver/model/buylist/Product.java | 4 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../model/entity/BlockCheckerEngine.java | 14 +- .../gameserver/model/entity/Castle.java | 36 ++-- .../gameserver/model/entity/Couple.java | 10 +- .../gameserver/model/entity/Duel.java | 10 +- .../gameserver/model/entity/Fort.java | 36 ++-- .../gameserver/model/entity/FortSiege.java | 38 ++-- .../gameserver/model/entity/L2Event.java | 12 +- .../gameserver/model/entity/Siege.java | 24 +-- .../model/events/AbstractScript.java | 66 +++--- .../model/events/EventDispatcher.java | 8 +- .../listeners/AnnotationEventListener.java | 4 +- .../listeners/FunctionEventListener.java | 4 +- .../model/itemcontainer/ItemContainer.java | 6 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PcInventory.java | 6 +- .../model/itemcontainer/PcRefund.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 2 +- .../model/items/enchant/EnchantItemGroup.java | 6 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../model/items/instance/L2ItemInstance.java | 4 +- .../model/olympiad/AbstractOlympiadGame.java | 12 +- .../model/olympiad/OlympiadGameManager.java | 6 +- .../model/olympiad/OlympiadGameNormal.java | 14 +- .../model/olympiad/OlympiadGameTask.java | 32 +-- .../model/punishment/PunishmentTask.java | 6 +- .../gameserver/model/quest/LongTimeEvent.java | 20 +- .../gameserver/model/quest/Quest.java | 42 ++-- .../gameserver/model/quest/QuestState.java | 6 +- .../gameserver/model/quest/QuestTimer.java | 4 +- .../model/shuttle/L2ShuttleEngine.java | 4 +- .../gameserver/model/skills/Skill.java | 14 +- .../model/skills/SkillChannelizer.java | 10 +- .../model/variables/AccountVariables.java | 8 +- .../model/variables/ClanVariables.java | 8 +- .../model/variables/ItemVariables.java | 10 +- .../model/variables/PlayerVariables.java | 8 +- .../gameserver/model/zone/L2ZoneRespawn.java | 2 +- .../gameserver/model/zone/L2ZoneType.java | 4 +- .../model/zone/type/L2EffectZone.java | 4 +- .../gameserver/network/L2GameClient.java | 10 +- .../gameserver/network/NpcStringId.java | 4 +- .../network/clientpackets/Action.java | 2 +- .../network/clientpackets/AddTradeItem.java | 4 +- .../clientpackets/CharacterCreate.java | 12 +- .../clientpackets/CharacterDelete.java | 2 +- .../clientpackets/CharacterSelect.java | 4 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 4 +- .../network/clientpackets/ExGetOnAirShip.java | 8 +- .../network/clientpackets/GameGuardReply.java | 2 +- .../clientpackets/IClientIncomingPacket.java | 2 +- .../network/clientpackets/Logout.java | 4 +- .../clientpackets/MultiSellChoose.java | 14 +- .../clientpackets/ProtocolVersion.java | 4 +- .../clientpackets/RequestAcquireSkill.java | 8 +- .../RequestAcquireSkillInfo.java | 8 +- .../clientpackets/RequestActionUse.java | 4 +- .../network/clientpackets/RequestBlock.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../clientpackets/RequestBypassToServer.java | 10 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 2 +- .../clientpackets/RequestExChangeName.java | 2 +- .../RequestExCubeGameChangeTeam.java | 4 +- .../RequestExCubeGameReadyAnswer.java | 2 +- .../clientpackets/RequestExFishRanking.java | 2 +- .../RequestExMagicSkillUseGround.java | 2 +- .../RequestExTryToPutEnchantTargetItem.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 +- .../clientpackets/RequestMagicSkillList.java | 2 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 2 +- .../clientpackets/RequestPCCafeCouponUse.java | 2 +- .../clientpackets/RequestPackageSend.java | 6 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../RequestPetitionFeedback.java | 2 +- .../clientpackets/RequestPreviewItem.java | 6 +- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../RequestPrivateStoreSell.java | 2 +- .../clientpackets/RequestRefundItem.java | 2 +- .../RequestReplySurrenderPledgeWar.java | 2 +- .../network/clientpackets/RequestRestart.java | 4 +- .../clientpackets/RequestRestartPoint.java | 12 +- .../clientpackets/RequestSendPost.java | 4 +- .../RequestSetCastleSiegeTime.java | 10 +- .../network/clientpackets/Say2.java | 10 +- .../clientpackets/SendBypassBuildCmd.java | 4 +- .../SendWareHouseDepositList.java | 6 +- .../SendWareHouseWithDrawList.java | 4 +- .../network/clientpackets/UseItem.java | 2 +- .../clientpackets/ValidatePosition.java | 6 +- .../commission/RequestCommissionRegister.java | 2 +- .../RequestCrystallizeEstimate.java | 2 +- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendDel.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 2 +- .../pledgebonus/RequestPledgeBonusReward.java | 2 +- .../primeshop/RequestBRProductList.java | 2 +- .../sayune/RequestFlyMoveStart.java | 4 +- .../shuttle/RequestShuttleGetOn.java | 2 +- .../loginserverpackets/game/BlowFishKey.java | 4 +- .../serverpackets/AbstractHtmlPacket.java | 4 +- .../serverpackets/AbstractMessagePacket.java | 2 +- .../serverpackets/CharSelectionInfo.java | 8 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/IClientOutgoingPacket.java | 2 +- .../PledgeReceiveSubPledgeCreated.java | 2 +- .../serverpackets/RecipeItemMakeInfo.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../gameserver/script/DateRange.java | 4 +- .../gameserver/script/ScriptDocument.java | 8 +- .../security/SecondaryPasswordAuth.java | 20 +- .../taskmanager/AttackStanceTaskManager.java | 4 +- .../l2jmobius/gameserver/util/Broadcast.java | 4 +- .../com/l2jmobius/gameserver/util/Evolve.java | 6 +- .../gameserver/util/FloodProtectorAction.java | 14 +- .../l2jmobius/gameserver/util/GMAudit.java | 4 +- .../gameserver/util/OfflineTradeUtil.java | 4 +- .../loginserver/FloodProtectedListener.java | 12 +- .../loginserver/GameServerThread.java | 26 +-- .../l2jmobius/loginserver/L2LoginServer.java | 22 +- .../loginserver/LoginController.java | 28 +-- .../network/L2JGameServerPacketHandler.java | 8 +- .../loginserver/network/L2LoginClient.java | 4 +- .../clientpackets/RequestAuthLogin.java | 6 +- .../gameserverpackets/BlowFishKey.java | 4 +- .../gameserverpackets/ChangeAccessLevel.java | 4 +- .../gameserverpackets/ChangePassword.java | 6 +- .../gameserverpackets/GameServerAuth.java | 2 +- .../gameserverpackets/PlayerLogout.java | 2 +- .../gameserverpackets/PlayerTracert.java | 2 +- .../gameserverpackets/RequestTempBan.java | 4 +- .../gameserverpackets/ServerStatus.java | 2 +- .../network/serverpackets/ServerList.java | 4 +- .../loginserver/network/util/IPv4Filter.java | 4 +- 2180 files changed, 7679 insertions(+), 7634 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/AbstractNpcAI.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/AbstractNpcAI.java index 12e345f842..5647db4178 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/AbstractNpcAI.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/AbstractNpcAI.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class AbstractNpcAI extends Quest { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); public AbstractNpcAI() { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java index 1f8241ae42..d475493c5c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java @@ -76,7 +76,7 @@ public final class CrumaTower extends AbstractNpcAI } catch (Exception e) { - _log.warning("Invalid location for Cruma Tower teleport device."); + LOGGER.warning("Invalid location for Cruma Tower teleport device."); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java index b21c9b9df7..a1916fbe26 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java @@ -119,7 +119,7 @@ public final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - _log.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); + LOGGER.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); return null; } final int skillId = getSkillIdByNpcId(npc.getId()); @@ -144,7 +144,7 @@ public final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - _log.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); + LOGGER.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); return null; } final int skillId = getSkillIdByNpcId(npc.getId()); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 23514e5981..e86278e0e3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -135,7 +135,7 @@ public final class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000L; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000L, cycle); - _log.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index c56b9cd6e2..47ca8563c0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -303,7 +303,7 @@ public final class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - _log.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } @@ -368,7 +368,7 @@ public final class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - _log.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); return null; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java index 7fd192d114..fa11615bfe 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java @@ -199,7 +199,7 @@ public class EnchantedMegaliths extends AbstractNpcAI private void updateMegalithStage() { GlobalVariablesManager.getInstance().set(HB_MEGALITH_STAGE, stage); - _log.info("[Hellbound] - Enchanted Megaliths stage: " + stage); + LOGGER.info("[Hellbound] - Enchanted Megaliths stage: " + stage); switch (stage) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index e67e5ea74d..78377b5546 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -57,6 +58,8 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets; */ public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName()); + // NPCs private static final int CONQUEROR_MANAGER = 31921; private static final int EMPEROR_MANAGER = 31922; @@ -678,7 +681,7 @@ public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReade { ROOM_SPAWN_DATA.clear(); parseDatapackFile("data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.xml"); - _log.info("[Four Sepulchers] Loaded " + ROOM_SPAWN_DATA.size() + " spawn zones data."); + LOGGER.info("[Four Sepulchers] Loaded " + ROOM_SPAWN_DATA.size() + " spawn zones data."); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index d0e679a7d6..e428ba8107 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -319,7 +319,7 @@ public final class Raina extends AbstractNpcAI if (cType == null) { - _log.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); + LOGGER.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); } final StringBuilder sb = new StringBuilder(); @@ -404,7 +404,7 @@ public final class Raina extends AbstractNpcAI if (cType == null) { - _log.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); + LOGGER.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); } final StringBuilder sb = new StringBuilder(); @@ -894,7 +894,7 @@ public final class Raina extends AbstractNpcAI final String text = getHtm(player.getHtmlPrefix(), fileName); if (text == null) { - _log.info("Cannot find HTML file for " + Raina.class.getSimpleName() + " AI: " + fileName); + LOGGER.info("Cannot find HTML file for " + Raina.class.getSimpleName() + " AI: " + fileName); return null; } html.setHtml(text); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 1f39611ed2..bd2ea79b44 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -628,7 +628,7 @@ public final class Antharas extends AbstractNpcAI { if (!zone.isCharacterInZone(attacker) || (getStatus() != IN_FIGHT)) { - _log.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); attacker.teleToLocation(80464, 152294, -3534); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 33344e3f16..ef75b87d78 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -271,12 +271,12 @@ public class Lindvior extends AbstractNpcAI if (!_zoneLair.isInsideZone(attacker)) { attacker.doDie(null); - _log.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " out of the boss zone!"); + LOGGER.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " out of the boss zone!"); } if (!_zoneLair.isInsideZone(npc)) { npc.teleToLocation(CENTER_LOCATION, true); - _log.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " wich is out of the boss zone!"); + LOGGER.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " wich is out of the boss zone!"); } double percent = ((npc.getCurrentHp() - damage) / npc.getMaxHp()) * 100; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index fbe2297935..ff6ffbd3a9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -314,7 +314,7 @@ public final class Sailren extends AbstractNpcAI { if (STATUS == Status.IN_FIGHT) { - _log.info(getClass().getSimpleName() + ": Script is being unloaded while Sailren is active, clearing zone."); + LOGGER.info(getClass().getSimpleName() + ": Script is being unloaded while Sailren is active, clearing zone."); notifyEvent("TIME_OUT", null, null); } return super.unload(removeFromList); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index 41c7968623..202e22b1f3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -67,6 +68,8 @@ import instances.AbstractInstance; */ public final class Stage1 extends AbstractInstance implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(Stage1.class.getName()); + protected static class SODSpawn { public boolean isZone = false; @@ -207,7 +210,7 @@ public final class Stage1 extends AbstractInstance implements IGameXmlReader public void load() { parseDatapackFile("data/scripts/ai/bosses/Tiat/SeedOfDestruction.xml"); - _log.info("[Seed of Destruction] Loaded " + _spawnZoneList.size() + " spawn zones data."); + LOGGER.info("[Seed of Destruction] Loaded " + _spawnZoneList.size() + " spawn zones data."); } @Override @@ -346,7 +349,7 @@ public final class Stage1 extends AbstractInstance implements IGameXmlReader } else { - _log.info("[Seed of Destruction] Missing zone: " + spw.zone); + LOGGER.info("[Seed of Destruction] Missing zone: " + spw.zone); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java index 1fc5df6996..92ef8f9f25 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java @@ -150,7 +150,7 @@ public final class CastleAmbassador extends AbstractNpcAI if (fort == null) { npc.deleteMe(); - _log.warning("Spawned: " + npc + " location: " + npc.getLocation() + " without fort!"); + LOGGER.warning("Spawned: " + npc + " location: " + npc.getLocation() + " without fort!"); return null; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 45780446af..509ac8cb3d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1245,7 +1245,7 @@ public final class CastleChamberlain extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index 749f577141..e0f4f546e6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public final class ManorManager extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index a3a41cad2a..31580cdf91 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -73,7 +73,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler "watchmatch", "arenachange" }; - private static final Logger _LOG = Logger.getLogger(OlyManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlyManager.class.getName()); private OlyManager() { @@ -364,7 +364,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler final List spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns(); if (spectatorSpawns.isEmpty()) { - _LOG.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); + LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); @@ -375,7 +375,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler } catch (Exception e) { - _LOG.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 4ca3d1df97..813358bd0c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -88,7 +88,7 @@ public final class Elpies extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started because custom NPC table is disabled!"); + LOGGER.info(getName() + ": Event can't be started because custom NPC table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index e8d253c2c9..bd418adefc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -95,7 +95,7 @@ public final class Rabbits extends Event // Check starting conditions if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPCs are disabled!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java index 19f2f42bae..7756d0d55e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java @@ -121,7 +121,7 @@ public final class Race extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom npc table is disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom npc table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/listeners/ListenerTest.java index 73b858e854..59dcb31683 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -63,7 +63,7 @@ public class ListenerTest extends AbstractNpcAI // Manual listener registration Containers.Global().addListener(new ConsumerEventListener(Containers.Global(), EventType.ON_PLAYER_DLG_ANSWER, (OnPlayerDlgAnswer event) -> { - _log.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); }, this)); } @@ -73,7 +73,7 @@ public class ListenerTest extends AbstractNpcAI */ private void onAttackableAttack(OnAttackableAttack event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); } /** @@ -88,7 +88,7 @@ public class ListenerTest extends AbstractNpcAI @Id(22228) private void onCreatureKill(OnCreatureDeath event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); } /** @@ -101,7 +101,7 @@ public class ListenerTest extends AbstractNpcAI @Range(from = 1, to = 9) private void onSiegeStart(OnCastleSiegeStart event) { - _log.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); + LOGGER.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); } /** @@ -114,7 +114,7 @@ public class ListenerTest extends AbstractNpcAI @Id(5575) private void onItemCreate(OnItemCreate event) { - _log.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); + LOGGER.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); } /** @@ -152,7 +152,7 @@ public class ListenerTest extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void OnPlayerLogin(OnPlayerLogin event) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); } /** @@ -170,7 +170,7 @@ public class ListenerTest extends AbstractNpcAI { if (event.getTarget().isGM()) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); return new TerminateReturn(true, true, true); } return null; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java index 573b9e4b9f..920e4b5023 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java @@ -339,7 +339,7 @@ import handlers.voicedcommandhandlers.StatsVCmd; */ public class MasterHandler { - private static final Logger _log = Logger.getLogger(MasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MasterHandler.class.getName()); private static final IHandler[] LOAD_INSTANCES = { @@ -676,7 +676,7 @@ public class MasterHandler public static void main(String[] args) { - _log.info("Loading Handlers..."); + LOGGER.info("Loading Handlers..."); final Map, Method> registerHandlerMethods = new HashMap<>(); for (IHandler loadInstance : LOAD_INSTANCES) @@ -693,7 +693,7 @@ public class MasterHandler registerHandlerMethods.entrySet().stream().filter(e -> e.getValue() == null).forEach(e -> { - _log.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); + LOGGER.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); }); for (Class classes[] : HANDLERS) @@ -718,7 +718,7 @@ public class MasterHandler } catch (Exception e) { - _log.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); + LOGGER.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); continue; } } @@ -755,9 +755,9 @@ public class MasterHandler for (IHandler loadInstance : LOAD_INSTANCES) { - _log.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); + LOGGER.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); } - _log.info("Handlers Loaded..."); + LOGGER.info("Handlers Loaded..."); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java index 2c0368fa04..6239aa2af9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java @@ -34,7 +34,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target; if (staticObject.getType() < 0) { - _log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); + LOGGER.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); } // Check if the L2PcInstance already target the L2NpcInstance diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7b78de63fe..1ead5e9548 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminAdmin implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminAdmin.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminAdmin.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -121,7 +121,7 @@ public class AdminAdmin implements IAdminCommandHandler } catch (Exception e) { - _log.warning("An error occured while ending olympiad: " + e); + LOGGER.warning("An error occured while ending olympiad: " + e); } activeChar.sendMessage("Heroes formed."); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index d0ed3c7df9..57d100be33 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.UserInfo; */ public class AdminEditChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEditChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEditChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -218,7 +218,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set reputation error: " + e); + LOGGER.warning("Set reputation error: " + e); } activeChar.sendMessage("Usage: //setreputation "); } @@ -261,7 +261,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pk error: " + e); + LOGGER.warning("Set pk error: " + e); } activeChar.sendMessage("Usage: //setpk "); } @@ -291,7 +291,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pvp error: " + e); + LOGGER.warning("Set pvp error: " + e); } activeChar.sendMessage("Usage: //setpvp "); } @@ -321,7 +321,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set Fame error: " + e); + LOGGER.warning("Set Fame error: " + e); } activeChar.sendMessage("Usage: //setfame "); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 1634710c12..2de1bf7bd5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; */ public class AdminEnchant implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEnchant.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEnchant.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -146,7 +146,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a new enchant value."); } @@ -154,7 +154,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a valid new enchant value."); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index 5acf20c5b6..1da9a18c9d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminHeal implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_heal" @@ -57,7 +57,7 @@ public class AdminHeal implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Heal error: " + e); + LOGGER.warning("Heal error: " + e); } activeChar.sendMessage("Incorrect target/radius specified."); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index 549035d177..5ab19d4b39 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminMenu implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminMenu.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminMenu.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -112,7 +112,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_recall_clan_menu")) @@ -141,7 +141,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_goto_char_menu")) @@ -190,7 +190,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -207,7 +207,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5b95022983..cd89f2cc84 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminPunishment implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPunishment.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPunishment.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -86,7 +86,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); } } else @@ -149,7 +149,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); } break; } @@ -186,7 +186,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); } break; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java index 934e877d84..764ab77c25 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminRepairChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRepairChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRepairChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -101,7 +101,7 @@ public class AdminRepairChar implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "could not repair char:", e); + LOGGER.log(Level.WARNING, "could not repair char:", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java index dfd8ab322b..52c768b06a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList; */ public class AdminShop implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShop.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShop.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -106,7 +106,7 @@ public class AdminShop implements IAdminCommandHandler } catch (Exception e) { - _log.warning("admin buylist failed:" + command); + LOGGER.warning("admin buylist failed:" + command); } final ProductList buyList = BuyListData.getInstance().getBuyList(val); @@ -117,7 +117,7 @@ public class AdminShop implements IAdminCommandHandler } else { - _log.warning("no buylist with id:" + val); + LOGGER.warning("no buylist with id:" + val); activeChar.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index a569d1fca6..780c3b0088 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.QuestList; */ public class AdminShowQuests implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShowQuests.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShowQuests.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -313,7 +313,7 @@ public class AdminShowQuests implements IAdminCommandHandler catch (Exception e) { actor.sendMessage("There was an error."); - _log.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java index ea51fdd106..93293c80e2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class AdminSkill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminSkill.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -526,7 +526,7 @@ public class AdminSkill implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } if (skill != null) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java index bf52975d48..603c953427 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class AdminSpawn implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSpawn.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -377,17 +377,17 @@ public class AdminSpawn implements IAdminCommandHandler default: case 0: { - _log.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); + LOGGER.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); break; } case 1: { - _log.info(""); + LOGGER.info(""); break; } case 2: { - _log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); + LOGGER.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); break; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java index 880aba40c1..a818e7f3d3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminSummon implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSummon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName()); public static final String[] ADMIN_COMMANDS = { @@ -69,7 +69,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -81,7 +81,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index a088b5f7f0..27bcfe9dd8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -50,7 +50,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminTeleport implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminTeleport.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminTeleport.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -525,7 +525,7 @@ public class AdminTeleport implements IAdminCommandHandler if (template1 == null) { activeChar.sendMessage("Incorrect monster template."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); return; } @@ -533,7 +533,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect monster spawn."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); return; } final int respawnTime = spawn.getRespawnDelay() / 1000; @@ -575,7 +575,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect raid spawn."); - _log.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); return; } DBSpawnManager.getInstance().deleteSpawn(spawn, true); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java index a02258ac82..6661cf897c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminUnblockIp implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminUnblockIp.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminUnblockIp.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -68,7 +68,7 @@ public class AdminUnblockIp implements IAdminCommandHandler private boolean unblockIp(String ipAddress, L2PcInstance activeChar) { // LoginServerThread.getInstance().unBlockip(ipAddress); - _log.warning("IP removed by GM " + activeChar.getName()); + LOGGER.warning("IP removed by GM " + activeChar.getName()); return true; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index d5baa52a73..fd68914b26 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -64,7 +64,7 @@ import ai.AbstractNpcAI; */ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPathNode.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPathNode.class.getName()); private final Map _zones = new ConcurrentHashMap<>(); private static final String[] COMMANDS = @@ -484,7 +484,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler catch (Exception e) { activeChar.sendMessage("Failed writing the dump: " + e.getMessage()); - _log.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Augment.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Augment.java index 6f3cdd671a..015cb20ce8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Augment.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Augment.java @@ -57,7 +57,7 @@ public class Augment implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Buy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Buy.java index dedd804298..5084dc1239 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Buy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Buy.java @@ -54,7 +54,7 @@ public class Buy implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 77244e8a99..b937970ce0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -112,7 +112,7 @@ public class ClanWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } } return false; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 383b2ac65a..648a840357 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -54,7 +54,7 @@ public class EventEngine implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 5bb42fb02d..2cc2c9cd2e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -121,7 +121,7 @@ public class ItemAuctionLink implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 1ee7660160..fc06d1b5ea 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -35,13 +35,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty link html!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - _log.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java index 15c9a87b30..bd019c6c2b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java @@ -59,7 +59,7 @@ public class Multisell implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 27bbae841c..8d2b77c311 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -62,7 +62,7 @@ public class NpcViewMod implements IBypassHandler if (!st.hasMoreTokens()) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -101,7 +101,7 @@ public class NpcViewMod implements IBypassHandler { if (st.countTokens() < 2) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -124,7 +124,7 @@ public class NpcViewMod implements IBypassHandler } catch (IllegalArgumentException e) { - _log.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); + LOGGER.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); return false; } break; @@ -571,7 +571,7 @@ public class NpcViewMod implements IBypassHandler String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/DropList.htm"); if (html == null) { - _log.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); + LOGGER.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); return; } html = html.replaceAll("%name%", npc.getName()); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 5ec5c94594..2f52504410 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -113,7 +113,7 @@ public class Observation implements IBypassHandler } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java index 6c16720329..0597ff6ab7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java @@ -66,7 +66,7 @@ public class PlayerHelp implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index d6c31d5495..59491ae669 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -67,7 +67,7 @@ public class PrivateWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 40de431ce5..fd1fe934bd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -63,7 +63,7 @@ public class Wear implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } @@ -73,7 +73,7 @@ public class Wear implements IBypassHandler final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index faa4b3ef97..d74fd3a648 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -39,7 +39,7 @@ public final class AttackTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": this effect must have parameters!"); + LOGGER.warning(getClass().getSimpleName() + ": this effect must have parameters!"); return; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 675e1023d2..3b0c1fb514 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -74,7 +74,7 @@ public final class CallSkill extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 924b08d8f7..b582a0e29e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -66,7 +66,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } return skill.isToggle(); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 36bed01887..9b3af7d06a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -39,7 +39,7 @@ public final class DefenceTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); return; } @@ -57,11 +57,11 @@ public final class DefenceTrait extends AbstractEffect } catch (NumberFormatException e) { - _log.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); + LOGGER.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); + LOGGER.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index b6d50cd89c..8fb26ea974 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -48,7 +48,7 @@ public final class Disarmor extends AbstractEffect _slot = ItemTable.SLOTS.getOrDefault(slot, L2Item.SLOT_NONE); if (_slot == L2Item.SLOT_NONE) { - _log.severe("Unknown bodypart slot for effect: " + slot); + LOGGER.severe("Unknown bodypart slot for effect: " + slot); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index adf474fe77..dbc72f8b13 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -59,7 +59,7 @@ public final class Restoration extends AbstractEffect if ((_itemId <= 0) || (_itemCount <= 0)) { effected.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE); - _log.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); + LOGGER.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); return; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java index f9a102f869..edcd13b407 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -97,7 +97,7 @@ public final class Summon extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 0fab6deaee..c73eb71458 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -38,7 +38,7 @@ public final class SummonAgathion extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); } _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7ad2935324..d745528a40 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -64,7 +64,7 @@ public final class SummonCubic extends AbstractEffect if (_cubicId < 0) { - _log.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); return; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index b10d5cb341..d88f72ee89 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -66,7 +66,7 @@ public class SummonHallucination extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -79,7 +79,7 @@ public class SummonHallucination extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 03d7f27857..15c94c90a2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -87,7 +87,7 @@ public final class SummonMulti extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index ae4549f39f..5779663ae6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -80,7 +80,7 @@ public final class SummonNpc extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -93,7 +93,7 @@ public final class SummonNpc extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } @@ -162,7 +162,7 @@ public final class SummonNpc extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); + LOGGER.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); return; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5d8b92393c..a771a8e4cc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -75,14 +75,14 @@ public final class SummonPet extends AbstractEffect final PetItemHolder holder = player.removeScript(PetItemHolder.class); if (holder == null) { - _log.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); + LOGGER.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); return; } final L2ItemInstance collar = holder.getItem(); if (player.getInventory().getItemByObjectId(collar.getObjectId()) != collar) { - _log.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); + LOGGER.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); return; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 4528a3f91b..984c53a5ab 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -57,7 +57,7 @@ public final class SummonTrap extends AbstractEffect if (_npcId <= 0) { - _log.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); return; } @@ -76,7 +76,7 @@ public final class SummonTrap extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index c3a9b08bde..8d18d6fecc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -110,7 +110,7 @@ public final class Synergy extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 32ac16aa59..da879def26 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -146,7 +146,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index c9ce6cc000..b7d80e1e34 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -64,7 +64,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -81,7 +81,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 351e687f0f..2ce0c6758c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -88,7 +88,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c950983e3d..1c010ed094 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -91,7 +91,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 7a474f5b8d..956ef40eed 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -102,7 +102,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index fefd166e0d..014142ca85 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -114,7 +114,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 23a72039a7..1f0c32d50d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -97,7 +97,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -124,7 +124,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ca7c1239ec..c34321b251 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -90,7 +90,7 @@ public class BeastSoulShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index d631936c0d..8a39d5177d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -92,7 +92,7 @@ public class BeastSpiritShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index a053b95a9d..e3b723050d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -52,7 +52,7 @@ public class BlessedSoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9800a7e664..52f772757a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -48,7 +48,7 @@ public class BlessedSpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index e7c5629cc7..e1df0bdc7a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -59,7 +59,7 @@ public class EventItem implements IItemHandler } default: { - _log.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); + LOGGER.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); } } return used; @@ -103,7 +103,7 @@ public class EventItem implements IItemHandler }); return true; } - _log.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); + LOGGER.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); return false; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 15525c66cf..a6f22ad3e8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -54,7 +54,7 @@ public class ExtractableItems implements IItemHandler final List exitems = etcitem.getExtractableItems(); if (exitems == null) { - _log.info("No extractable data defined for " + etcitem); + LOGGER.info("No extractable data defined for " + etcitem); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 5c5598ea69..ac21e53795 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -84,7 +84,7 @@ public class FishShots implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 4773bde656..59fe8bc737 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -51,7 +51,7 @@ public final class Harvester implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index be807a28fd..3140a14fb6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -61,7 +61,7 @@ public class ItemSkillsTemplate implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.info("Item " + item + " does not have registered any skill for handler."); + LOGGER.info("Item " + item + " does not have registered any skill for handler."); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 05c1ac3f7d..d3ffb95e30 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -49,7 +49,7 @@ public class SoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index ddf0402d2b..87f06565c2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -48,7 +48,7 @@ public class SpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java index 7144892fa5..59ecba44bb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ClanWarsList implements IUserCommandHandler { - private static final Logger _log = Logger.getLogger(ClanWarsList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanWarsList.class.getName()); private static final int[] COMMAND_IDS = { 88, @@ -119,7 +119,7 @@ public class ClanWarsList implements IUserCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } return true; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java index 7dced5f20e..5e98fa04f5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - _log.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); return; } @@ -133,7 +133,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // When nobody can enter if (enterGroup == null) { - _log.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); + LOGGER.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); return; } @@ -214,7 +214,7 @@ public abstract class AbstractInstance extends AbstractNpcAI } else { - _log.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); + LOGGER.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 87fe82da43..1a091c8e32 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -430,7 +430,7 @@ public final class ChamberOfDelusion extends AbstractInstance } catch (Exception e) { - _log.log(Level.WARNING, "Error occured in room change task: ", e); + LOGGER.log(Level.WARNING, "Error occured in room change task: ", e); } }, nextInterval - 5000); world.setParameter("roomChangeTask", roomChangeTask); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 8d437b8318..38eb8cc483 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -655,7 +655,7 @@ public final class Kamaloka extends AbstractInstance } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } return null; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 53c7dc8107..edd8db852d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -209,7 +209,7 @@ public class Q00350_EnhanceYourWeapon extends Quest } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } return null; } @@ -515,7 +515,7 @@ public class Q00350_EnhanceYourWeapon extends Quest File file = new File(Config.DATAPACK_ROOT, "data/LevelUpCrystalData.xml"); if (!file.exists()) { - _log.severe("[EnhanceYourWeapon] Missing LevelUpCrystalData.xml. The quest wont work without it!"); + LOGGER.severe("[EnhanceYourWeapon] Missing LevelUpCrystalData.xml. The quest wont work without it!"); return; } @@ -535,7 +535,7 @@ public class Q00350_EnhanceYourWeapon extends Quest Node att = attrs.getNamedItem("itemId"); if (att == null) { - _log.severe("[EnhanceYourWeapon] Missing itemId in Crystal List, skipping"); + LOGGER.severe("[EnhanceYourWeapon] Missing itemId in Crystal List, skipping"); continue; } int itemId = Integer.parseInt(attrs.getNamedItem("itemId").getNodeValue()); @@ -543,7 +543,7 @@ public class Q00350_EnhanceYourWeapon extends Quest att = attrs.getNamedItem("level"); if (att == null) { - _log.severe("[EnhanceYourWeapon] Missing level in Crystal List itemId: " + itemId + ", skipping"); + LOGGER.severe("[EnhanceYourWeapon] Missing level in Crystal List itemId: " + itemId + ", skipping"); continue; } int level = Integer.parseInt(attrs.getNamedItem("level").getNodeValue()); @@ -551,7 +551,7 @@ public class Q00350_EnhanceYourWeapon extends Quest att = attrs.getNamedItem("leveledItemId"); if (att == null) { - _log.severe("[EnhanceYourWeapon] Missing leveledItemId in Crystal List itemId: " + itemId + ", skipping"); + LOGGER.severe("[EnhanceYourWeapon] Missing leveledItemId in Crystal List itemId: " + itemId + ", skipping"); continue; } int leveledItemId = Integer.parseInt(attrs.getNamedItem("leveledItemId").getNodeValue()); @@ -570,7 +570,7 @@ public class Q00350_EnhanceYourWeapon extends Quest Node att = attrs.getNamedItem("npcId"); if (att == null) { - _log.severe("[EnhanceYourWeapon] Missing npcId in NPC List, skipping"); + LOGGER.severe("[EnhanceYourWeapon] Missing npcId in NPC List, skipping"); continue; } @@ -608,7 +608,7 @@ public class Q00350_EnhanceYourWeapon extends Quest Node att2 = attrs.getNamedItem("levelList"); if ((att1 == null) && (att2 == null)) { - _log.severe("[EnhanceYourWeapon] Missing maxlevel/levelList in NPC List npcId: " + npcId + ", skipping"); + LOGGER.severe("[EnhanceYourWeapon] Missing maxlevel/levelList in NPC List npcId: " + npcId + ", skipping"); continue; } LevelingInfo info = new LevelingInfo(absorbType, isSkillNeeded, chance); @@ -629,7 +629,7 @@ public class Q00350_EnhanceYourWeapon extends Quest Integer value = Integer.decode(st.nextToken().trim()); if (value == null) { - _log.severe("[EnhanceYourWeapon] Bad Level value!! npcId: " + npcId + " token: " + i); + LOGGER.severe("[EnhanceYourWeapon] Bad Level value!! npcId: " + npcId + " token: " + i); value = 0; } temp.put(value, info); @@ -640,7 +640,7 @@ public class Q00350_EnhanceYourWeapon extends Quest if (temp.isEmpty()) { - _log.severe("[EnhanceYourWeapon] No leveling info for npcId: " + npcId + ", skipping"); + LOGGER.severe("[EnhanceYourWeapon] No leveling info for npcId: " + npcId + ", skipping"); continue; } NPC_LEVELING_INFO.put(npcId, temp); @@ -652,9 +652,9 @@ public class Q00350_EnhanceYourWeapon extends Quest } catch (Exception e) { - _log.log(Level.WARNING, "[EnhanceYourWeapon] Could not parse LevelUpCrystalData.xml file: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "[EnhanceYourWeapon] Could not parse LevelUpCrystalData.xml file: " + e.getMessage(), e); } - _log.info("[EnhanceYourWeapon] Loaded " + SOUL_CRYSTALS.size() + " Soul Crystal data."); - _log.info("[EnhanceYourWeapon] Loaded " + NPC_LEVELING_INFO.size() + " npc Leveling info data."); + LOGGER.info("[EnhanceYourWeapon] Loaded " + SOUL_CRYSTALS.size() + " Soul Crystal data."); + LOGGER.info("[EnhanceYourWeapon] Loaded " + NPC_LEVELING_INFO.size() + " npc Leveling info data."); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/QuestMasterHandler.java index 00ffb03e79..9850f795b2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/QuestMasterHandler.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/QuestMasterHandler.java @@ -454,7 +454,7 @@ import quests.Q10800_ReconnaissanceAtDragonValley.Q10800_ReconnaissanceAtDragonV */ public class QuestMasterHandler { - private static final Logger _log = Logger.getLogger(QuestMasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(QuestMasterHandler.class.getName()); private static final Class[] QUESTS = { @@ -899,7 +899,7 @@ public class QuestMasterHandler } catch (Exception e) { - _log.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); + LOGGER.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java index bcd888210f..623b41de9f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java @@ -74,7 +74,7 @@ public abstract class AirShipController extends AbstractNpcAI } } - public static final Logger _log = Logger.getLogger(AirShipController.class.getName()); + public static final Logger LOGGER = Logger.getLogger(AirShipController.class.getName()); protected int _dockZone = 0; protected int _shipSpawnX = 0; protected int _shipSpawnY = 0; @@ -334,7 +334,7 @@ public abstract class AirShipController extends AbstractNpcAI final L2ScriptZone zone = ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class); if (zone == null) { - _log.warning(getName() + ": Invalid zone " + _dockZone + ", controller disabled"); + LOGGER.warning(getName() + ": Invalid zone " + _dockZone + ", controller disabled"); _isBusy = true; return; } @@ -344,7 +344,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (_arrivalPath.length == 0) { - _log.warning(getName() + ": Zero arrival path length."); + LOGGER.warning(getName() + ": Zero arrival path length."); _arrivalPath = null; } else @@ -352,7 +352,7 @@ public abstract class AirShipController extends AbstractNpcAI p = _arrivalPath[_arrivalPath.length - 1]; if (!zone.isInsideZone(p.getLocation())) { - _log.warning(getName() + ": Arrival path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") not in zone " + _dockZone); + LOGGER.warning(getName() + ": Arrival path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") not in zone " + _dockZone); _arrivalPath = null; } } @@ -361,7 +361,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (!ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class).isInsideZone(_shipSpawnX, _shipSpawnY, _shipSpawnZ)) { - _log.warning(getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled"); + LOGGER.warning(getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled"); _isBusy = true; return; } @@ -371,7 +371,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (_departPath.length == 0) { - _log.warning(getName() + ": Zero depart path length."); + LOGGER.warning(getName() + ": Zero depart path length."); _departPath = null; } else @@ -379,7 +379,7 @@ public abstract class AirShipController extends AbstractNpcAI p = _departPath[_departPath.length - 1]; if (zone.isInsideZone(p.getLocation())) { - _log.warning(getName() + ": Departure path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") in zone " + _dockZone); + LOGGER.warning(getName() + ": Departure path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") in zone " + _dockZone); _departPath = null; } } @@ -389,11 +389,11 @@ public abstract class AirShipController extends AbstractNpcAI { if (_fuelTable == null) { - _log.warning(getName() + ": Fuel consumption not defined."); + LOGGER.warning(getName() + ": Fuel consumption not defined."); } else if (_teleportsTable.length != _fuelTable.length) { - _log.warning(getName() + ": Fuel consumption not match teleport list."); + LOGGER.warning(getName() + ": Fuel consumption not match teleport list."); } else { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatGludinRune.java index c162606bf1..7edfc605df 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatGludinRune implements Runnable { - private static final Logger _log = Logger.getLogger(BoatGludinRune.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatGludinRune.class.getName()); // Time: 1151s private static final VehiclePathPoint[] GLUDIN_TO_RUNE = @@ -343,7 +343,7 @@ public class BoatGludinRune implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index 1805617eaf..fea42bcaa9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatInnadrilTour implements Runnable { - private static final Logger _log = Logger.getLogger(BoatInnadrilTour.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatInnadrilTour.class.getName()); // Time: 1867s private static final VehiclePathPoint[] TOUR = @@ -186,7 +186,7 @@ public class BoatInnadrilTour implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index c04177df76..1e62f23d02 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatRunePrimeval implements Runnable { - private static final Logger _log = Logger.getLogger(BoatRunePrimeval.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatRunePrimeval.class.getName()); // Time: 239s private static final VehiclePathPoint[] RUNE_TO_PRIMEVAL = @@ -168,7 +168,7 @@ public class BoatRunePrimeval implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseRecievePacket.java index b8e2b08f14..33146d6d53 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseRecievePacket.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public abstract class BaseRecievePacket { - private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseRecievePacket.class.getName()); private final byte[] _decrypt; private int _off; @@ -78,7 +78,7 @@ public abstract class BaseRecievePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } return result; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseSendablePacket.java index 894ea357b0..c29adc3bce 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseSendablePacket.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; */ public abstract class BaseSendablePacket { - private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseSendablePacket.class.getName()); private final ByteArrayOutputStream _bao; @@ -78,7 +78,7 @@ public abstract class BaseSendablePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } _bao.write(0); @@ -93,7 +93,7 @@ public abstract class BaseSendablePacket } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java index a2f78c7c94..a11ea8c3b5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; public class ScrambledKeyPair { - private static Logger _log = Logger.getLogger(ScrambledKeyPair.class.getName()); + private static Logger LOGGER = Logger.getLogger(ScrambledKeyPair.class.getName()); public KeyPair _pair; public byte[] _scrambledModulus; @@ -66,7 +66,7 @@ public class ScrambledKeyPair { scrambledMod[0x40 + i] = (byte) (scrambledMod[0x40 + i] ^ scrambledMod[i]); } - _log.finer("Modulus was scrambled"); + LOGGER.finer("Modulus was scrambled"); return scrambledMod; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java index a4df772cc3..57a47cf456 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class ForumsBBSManager extends BaseBBSManager { - private static Logger _log = Logger.getLogger(ForumsBBSManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(ForumsBBSManager.class.getName()); private final List _table; private int _lastid = 1; @@ -51,7 +51,7 @@ public class ForumsBBSManager extends BaseBBSManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); } } @@ -61,7 +61,7 @@ public class ForumsBBSManager extends BaseBBSManager public void initRoot() { _table.forEach(f -> f.vload()); - _log.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java index 609f0858d5..4aa8b72edb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class CharNameTable { - private static Logger _log = Logger.getLogger(CharNameTable.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharNameTable.class.getName()); private final Map _chars = new ConcurrentHashMap<>(); private final Map _accessLevels = new ConcurrentHashMap<>(); @@ -114,7 +114,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); } if (id > 0) @@ -162,7 +162,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return null; // not found @@ -190,7 +190,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); } return result; } @@ -211,7 +211,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); } return 0; } @@ -232,7 +232,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -253,7 +253,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); } return 0; } @@ -274,7 +274,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -294,9 +294,9 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); } public static CharNameTable getInstance() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/DocumentBase.java index 37410b0b38..fde34c2bc6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/DocumentBase.java @@ -148,7 +148,7 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public abstract class DocumentBase { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final File _file; protected final Map _tables = new HashMap<>(); @@ -171,7 +171,7 @@ public abstract class DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Error loading file " + _file, e); + LOGGER.log(Level.SEVERE, "Error loading file " + _file, e); } return doc; } @@ -344,7 +344,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -361,7 +361,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -375,7 +375,7 @@ public abstract class DocumentBase return new ConditionLogicNot(parseCondition(n, template)); } } - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); return null; } @@ -900,7 +900,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1095,7 +1095,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1135,7 +1135,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); + LOGGER.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); } } cond = joinAnd(cond, new ConditionUsingItemType(mask)); @@ -1156,7 +1156,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); + LOGGER.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); } } cond = joinAnd(cond, new ConditionUsingSlotType(mask)); @@ -1192,7 +1192,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1222,7 +1222,7 @@ public abstract class DocumentBase } if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java index 4d3be938c9..c425e3360c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.LinkedList; import java.util.List; import java.util.logging.Level; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -43,6 +44,8 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public final class DocumentItem extends DocumentBase implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(DocumentItem.class.getName()); + private Item _currentItem = null; private final List _itemsInFile = new LinkedList<>(); @@ -92,7 +95,7 @@ public final class DocumentItem extends DocumentBase implements IGameXmlReader } catch (Exception e) { - _log.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); + LOGGER.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 6832094027..5343f17e51 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.util.MathUtil; */ public class GeoEngine { - protected static final Logger _log = Logger.getLogger(GeoEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GeoEngine.class.getName()); private final ABlock[][] _blocks; private final BlockNull _nullBlock; @@ -71,7 +71,7 @@ public class GeoEngine */ public GeoEngine() { - _log.info("GeoEngine: Initializing..."); + LOGGER.info("GeoEngine: Initializing..."); // initialize block container _blocks = new ABlock[GeoStructure.GEO_BLOCKS_X][GeoStructure.GEO_BLOCKS_Y]; @@ -105,7 +105,7 @@ public class GeoEngine } } - _log.info("GeoEngine: Loaded " + loaded + " geodata files."); + LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files."); // avoid wrong configs when no files are loaded if (loaded == 0) @@ -113,12 +113,12 @@ public class GeoEngine if (Config.PATHFINDING) { Config.PATHFINDING = false; - _log.info("GeoEngine: Forcing PathFinding setting to false."); + LOGGER.info("GeoEngine: Forcing PathFinding setting to false."); } if (Config.COORD_SYNCHRONIZE == 2) { Config.COORD_SYNCHRONIZE = -1; - _log.info("GeoEngine: Forcing CoordSynchronize setting to -1."); + LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); } } @@ -185,7 +185,7 @@ public class GeoEngine // check data consistency if (buffer.remaining() > 0) { - _log.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); + LOGGER.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); } // loading was successful @@ -194,8 +194,8 @@ public class GeoEngine catch (Exception e) { // an error occured while loading, load null blocks - _log.warning("GeoEngine: Error while loading " + filename + " region file."); - _log.warning(e.getMessage()); + LOGGER.warning("GeoEngine: Error while loading " + filename + " region file."); + LOGGER.warning(e.getMessage()); e.printStackTrace(); // replace whole region file with null blocks @@ -300,7 +300,7 @@ public class GeoEngine if (block == null) // null block check { // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) - // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // LOGGER.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java index ece8351c5e..b33b0292ac 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java @@ -57,11 +57,11 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); + LOGGER.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); } } - _log.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); + LOGGER.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); } @Override @@ -109,7 +109,7 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); return null; } finally diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IActionHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IActionHandler.java index c4addd7df5..3640b57f65 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IActionHandler.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IActionHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionHandler { - Logger _log = Logger.getLogger(IActionHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java index 35c546715c..5c5b946828 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionShiftHandler { - Logger _log = Logger.getLogger(IActionShiftHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionShiftHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IBypassHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IBypassHandler.java index a5a6295386..626cdb2b17 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IBypassHandler.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IBypassHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public interface IBypassHandler { - Logger _log = Logger.getLogger(IBypassHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IBypassHandler.class.getName()); /** * This is the worker method that is called when someone uses an bypass command. diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IItemHandler.java index 2f3d043ad0..a2079cc4ec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IItemHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public interface IItemHandler { - Logger _log = Logger.getLogger(IItemHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IItemHandler.class.getName()); /** * Launch task associated to the item. diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java index 4030ad83de..0f9c7b0132 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentType; */ public interface IPunishmentHandler { - Logger _log = Logger.getLogger(IPunishmentHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IPunishmentHandler.class.getName()); void onStart(PunishmentTask task); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java index 72b8a7b21a..d1cb086c89 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IUserCommandHandler { - Logger _log = Logger.getLogger(IUserCommandHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IUserCommandHandler.class.getName()); /** * this is the worker method that is called when someone uses an admin command. diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java index e16e1eb679..9712fd7b04 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -60,7 +60,7 @@ import com.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi */ public final class CommissionManager { - private static final Logger _log = Logger.getLogger(CommissionManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CommissionManager.class.getName()); private static final int INTERACTION_DISTANCE = 250; private static final int ITEMS_LIMIT_PER_REQUEST = 999; @@ -103,7 +103,7 @@ public final class CommissionManager final L2ItemInstance itemInstance = itemInstances.get(rs.getInt("item_object_id")); if (itemInstance == null) { - _log.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); + LOGGER.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); continue; } final CommissionItem commissionItem = new CommissionItem(commissionId, itemInstance, rs.getLong("price_per_unit"), rs.getTimestamp("start_time").toInstant(), rs.getByte("duration_in_days")); @@ -121,7 +121,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); } } @@ -270,7 +270,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); player.sendPacket(SystemMessageId.THE_ITEM_HAS_FAILED_TO_BE_REGISTERED); player.sendPacket(ExResponseCommissionRegister.FAILED); } @@ -409,7 +409,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); } return false; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java index 7f4c6abd61..f635c19883 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class FactionManager { - private static Logger _log = Logger.getLogger(FactionManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(FactionManager.class.getName()); private final Map _playerFactions = new ConcurrentHashMap<>(); protected FactionManager() @@ -57,9 +57,9 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); } public final int getFactionByCharId(int id) @@ -91,7 +91,7 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return 0; // not found diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index b0fdfdf390..dc63278e16 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.entity.Fort; public final class FortManager implements InstanceListManager { - protected static final Logger _log = Logger.getLogger(FortManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); private final Map _forts = new ConcurrentSkipListMap<>(); @@ -131,7 +131,7 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - _log.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); for (Fort fort : getForts()) { fort.getSiege().loadSiegeGuard(); @@ -139,7 +139,7 @@ public final class FortManager implements InstanceListManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index aa7e2d3153..0a5245dafc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class FortSiegeManager { - private static final Logger _log = Logger.getLogger(FortSiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FortSiegeManager.class.getName()); private int _attackerMaxClans = 500; // Max number of clans @@ -101,7 +101,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -122,7 +122,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); + LOGGER.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); } // Siege setting @@ -163,7 +163,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading commander(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading commander(s) for " + fort.getName() + " fort."); } } @@ -189,7 +189,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading flag(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading flag(s) for " + fort.getName() + " fort."); } } _flagList.put(fort.getResidenceId(), _flagSpawns); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index 14f412ec48..338620a64f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; public final class GraciaSeedsManager { - private static final Logger _log = Logger.getLogger(GraciaSeedsManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GraciaSeedsManager.class.getName()); public static String ENERGY_SEEDS = "EnergySeeds"; @@ -70,7 +70,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); + LOGGER.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); break; } } @@ -124,7 +124,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); + LOGGER.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); } } } @@ -134,7 +134,7 @@ public final class GraciaSeedsManager final Quest quest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (quest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -155,7 +155,7 @@ public final class GraciaSeedsManager final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (esQuest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -171,7 +171,7 @@ public final class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { - _log.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); + LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 9c43355936..0a62e46364 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -47,7 +47,7 @@ public final class GrandBossManager implements IStorable private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?"; private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?"; - protected static Logger _log = Logger.getLogger(GrandBossManager.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GrandBossManager.class.getName()); protected static Map _bosses = new ConcurrentHashMap<>(); @@ -83,26 +83,26 @@ public final class GrandBossManager implements IStorable final int status = rs.getInt("status"); _bossStatus.put(bossId, status); _storedInfo.put(bossId, info); - _log.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); + LOGGER.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); if (status > 0) { - _log.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); + LOGGER.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); } } else { - _log.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); + LOGGER.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); } } - _log.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); } ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000); } @@ -115,7 +115,7 @@ public final class GrandBossManager implements IStorable public void setBossStatus(int bossId, int status) { _bossStatus.put(bossId, status); - _log.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); + LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); updateDb(bossId, true); } @@ -194,7 +194,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); return false; } return true; @@ -242,7 +242,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index e8b430a5df..c7290b6912 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public final class ItemsOnGroundManager implements Runnable { - private static final Logger _log = Logger.getLogger(ItemsOnGroundManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemsOnGroundManager.class.getName()); private final Set _items = ConcurrentHashMap.newKeySet(); @@ -88,7 +88,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); } } @@ -137,11 +137,11 @@ public final class ItemsOnGroundManager implements Runnable } } } - _log.info(getClass().getSimpleName() + ": Loaded " + count + " items."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + count + " items."); } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); } if (Config.EMPTY_DROPPED_ITEM_TABLE_AFTER_LOAD) @@ -185,7 +185,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e1) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); } } @@ -235,13 +235,13 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); } } } catch (SQLException e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java index ba4fdd6b6c..f47cf3f813 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.variables.PlayerVariables; */ public class MentorManager { - private static final Logger _log = Logger.getLogger(MentorManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MentorManager.class.getName()); private final Map> _menteeData = new ConcurrentHashMap<>(); private final Map _mentors = new ConcurrentHashMap<>(); @@ -65,7 +65,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -85,7 +85,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -104,7 +104,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } finally { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index f0f9d590c3..07ca9d909e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class PetitionManager { - protected static final Logger _log = Logger.getLogger(PetitionManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PetitionManager.class.getName()); private final Map _pendingPetitions; private final Map _completedPetitions; @@ -55,7 +55,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getCompletedPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() @@ -63,7 +63,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getPendingPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } public boolean acceptPetition(L2PcInstance respondingAdmin, int petitionId) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java index c1df0ca78b..6208afb86b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.Shutdown; */ public class ServerRestartManager { - static final Logger _log = Logger.getLogger(ServerRestartManager.class.getName()); + static final Logger LOGGER = Logger.getLogger(ServerRestartManager.class.getName()); private String nextRestartTime = "unknown"; @@ -72,12 +72,12 @@ public class ServerRestartManager { nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime()); ThreadPool.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000)); - _log.info("Scheduled server restart at " + lastRestart.getTime() + "."); + LOGGER.info("Scheduled server restart at " + lastRestart.getTime() + "."); } } catch (Exception e) { - _log.info("The scheduled server restart config is not set properly, please correct it!"); + LOGGER.info("The scheduled server restart config is not set properly, please correct it!"); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java index 0cef166f06..e7fa0b41a8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; public final class SiegeManager { - private static final Logger _log = Logger.getLogger(SiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SiegeManager.class.getName()); private final Map> _controlTowers = new HashMap<>(); private final Map> _flameTowers = new HashMap<>(); @@ -103,7 +103,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -152,7 +152,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); } } @@ -183,7 +183,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); } } _controlTowers.put(castle.getResidenceId(), controlTowers); @@ -289,7 +289,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java index 5e16e5a91f..876a3a1ec9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class MessageDeletionTask implements Runnable { - private static final Logger _log = Logger.getLogger(MessageDeletionTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MessageDeletionTask.class.getName()); final int _msgId; @@ -76,7 +76,7 @@ public final class MessageDeletionTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); } } MailManager.getInstance().deleteMessageInDb(msg.getId()); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/BlockList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/BlockList.java index 627b0dbbe4..3ec7e52fe7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/BlockList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/BlockList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BlockList { - private static Logger _log = Logger.getLogger(BlockList.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlockList.class.getName()); private static final Map> OFFLINE_LIST = new ConcurrentHashMap<>(); private final L2PcInstance _owner; @@ -91,7 +91,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); } return list; } @@ -122,7 +122,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java index 7be7f3cb10..f44f27266b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate; */ public final class CharEffectList { - private static final Logger _log = Logger.getLogger(CharEffectList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); /** Queue containing all effects from buffs for this effect list. */ private volatile Queue _actives; /** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */ @@ -897,7 +897,7 @@ public final class CharEffectList // Passive effects don't need stack type! if (!skill.getAbnormalType().isNone()) { - _log.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); + LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); } // Check for passive skill conditions. diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CursedWeapon.java index d579628d09..a9be2c6a4a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class CursedWeapon implements INamable { - private static final Logger _log = Logger.getLogger(CursedWeapon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CursedWeapon.class.getName()); // _name is the name of the cursed weapon associated with its ID. private final String _name; @@ -95,7 +95,7 @@ public class CursedWeapon implements INamable if ((_player != null) && _player.isOnline()) { // Remove from player - _log.info(_name + " being removed online."); + LOGGER.info(_name + " being removed online."); _player.abortAttack(); @@ -134,7 +134,7 @@ public class CursedWeapon implements INamable else { // Remove from Db - _log.info(_name + " being removed offline."); + LOGGER.info(_name + " being removed offline."); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?"); @@ -145,7 +145,7 @@ public class CursedWeapon implements INamable del.setInt(2, _itemId); if (del.executeUpdate() != 1) { - _log.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); + LOGGER.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); } // Restore the reputation @@ -154,12 +154,12 @@ public class CursedWeapon implements INamable ps.setInt(3, _playerId); if (ps.executeUpdate() != 1) { - _log.warning("Error while updating karma & pkkills for userId " + _playerId); + LOGGER.warning("Error while updating karma & pkkills for userId " + _playerId); } } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); } } } @@ -196,7 +196,7 @@ public class CursedWeapon implements INamable else if (_item != null) { _item.decayMe(); - _log.info(_name + " item has been removed from World."); + LOGGER.info(_name + " item has been removed from World."); } } @@ -492,7 +492,7 @@ public class CursedWeapon implements INamable } catch (SQLException e) { - _log.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); + LOGGER.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java index b69ba5f017..07cbeeee12 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -80,7 +80,7 @@ import com.l2jmobius.gameserver.util.Util; public class L2Clan implements IIdentifiable, INamable { - private static final Logger _log = Logger.getLogger(L2Clan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Clan.class.getName()); // SQL queries private static final String INSERT_CLAN_DATA = "INSERT INTO clan_data (clan_id,clan_name,clan_level,hasCastle,blood_alliance_count,blood_oath_count,ally_id,ally_name,leader_id,crest_id,crest_large_id,ally_crest_id,new_leader_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -272,7 +272,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); } } @@ -312,14 +312,14 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); } } broadcastClanStatus(); broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1).addString(member.getName())); - _log.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); + LOGGER.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); } /** @@ -329,7 +329,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - _log.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + getName() + " without clan leader!"); return ""; } return _leader.getName(); @@ -432,7 +432,7 @@ public class L2Clan implements IIdentifiable, INamable final L2ClanMember exMember = _members.remove(objectId); if (exMember == null) { - _log.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); + LOGGER.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); return; } final int leadssubpledge = getLeaderSubPledge(objectId); @@ -887,7 +887,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -931,7 +931,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -947,7 +947,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); } // Update variables at database @@ -990,7 +990,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); } } @@ -1031,7 +1031,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); } } @@ -1061,7 +1061,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); } } @@ -1136,7 +1136,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); } } @@ -1157,7 +1157,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); } } @@ -1199,7 +1199,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); } _notice = notice; @@ -1266,7 +1266,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); + LOGGER.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); } } } @@ -1274,7 +1274,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); } } @@ -1350,7 +1350,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.warning("Subpledge " + subType + " does not exist for clan " + this); + LOGGER.warning("Subpledge " + subType + " does not exist for clan " + this); return oldSkill; } } @@ -1382,7 +1382,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); @@ -1434,7 +1434,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } @@ -1780,7 +1780,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); } } @@ -1889,7 +1889,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); } broadcastToOnlineMembers(new PledgeShowInfoUpdate(_leader.getClan())); @@ -1954,7 +1954,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); } } @@ -1986,7 +1986,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); } } @@ -2022,7 +2022,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } for (L2ClanMember cm : getMembers()) @@ -2057,7 +2057,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); } } } @@ -2173,7 +2173,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); } } } @@ -2716,7 +2716,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); } setLevel(level); @@ -2762,7 +2762,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2799,7 +2799,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); } if (onlyThisClan) @@ -2845,7 +2845,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Mentee.java index 6122c5f6ac..a1eb3d2480 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class L2Mentee { - private static final Logger _log = Logger.getLogger(L2Mentee.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Mentee.class.getName()); private final int _objectId; private String _name; @@ -65,7 +65,7 @@ public class L2Mentee } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } else diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java index 5f14864046..38044ee767 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2Party extends AbstractPlayerGroup { - private static final Logger _log = Logger.getLogger(L2Party.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Party.class.getName()); // @formatter:off private static final double[] BONUS_EXP_SP = @@ -536,7 +536,7 @@ public class L2Party extends AbstractPlayerGroup } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } SystemMessage msg; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Territory.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Territory.java index 41cb26df2b..2ee5d868d2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Territory.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Territory.java @@ -28,7 +28,7 @@ import com.l2jmobius.commons.util.Rnd; */ public class L2Territory { - private static Logger _log = Logger.getLogger(L2Territory.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2Territory.class.getName()); protected static class Point { @@ -176,7 +176,7 @@ public class L2Territory return new Location(x, y, Rnd.get(zmin, _zMax)); } } - _log.warning("Can't make point for territory " + _terr); + LOGGER.warning("Can't make point for territory " + _terr); return null; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MacroList.java index 737e876e1e..577b101249 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MacroList.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SendMacroList; public class MacroList implements IRestorable { - private static final Logger _log = Logger.getLogger(MacroList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MacroList.class.getName()); private final L2PcInstance _owner; private int _macroId; @@ -154,7 +154,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store macro:", e); + LOGGER.log(Level.WARNING, "could not store macro:", e); } } @@ -169,7 +169,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete macro:", e); + LOGGER.log(Level.WARNING, "could not delete macro:", e); } } @@ -215,7 +215,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store shortcuts:", e); + LOGGER.log(Level.WARNING, "could not store shortcuts:", e); return false; } return true; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ShortCuts.java index 3f8d959ef6..81e2c6f902 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ShortCuts.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; public class ShortCuts implements IRestorable { - private static Logger _log = Logger.getLogger(ShortCuts.class.getName()); + private static Logger LOGGER = Logger.getLogger(ShortCuts.class.getName()); private static final int MAX_SHORTCUTS_PER_BAR = 12; private final L2PcInstance _owner; private final Map _shortCuts = new TreeMap<>(); @@ -100,7 +100,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); } } @@ -165,7 +165,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); } } @@ -195,7 +195,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TradeList.java index eeee7d0cae..f0f5a42ae6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TradeList.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class TradeList { - private static final Logger _log = Logger.getLogger(TradeList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TradeList.class.getName()); private final L2PcInstance _owner; private L2PcInstance _partner; @@ -198,45 +198,45 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Object o = L2World.getInstance().findObject(objectId); if (!(o instanceof L2ItemInstance)) { - _log.warning(_owner.getName() + ": Trying to add something other than an item!"); + LOGGER.warning(_owner.getName() + ": Trying to add something other than an item!"); return null; } final L2ItemInstance item = (L2ItemInstance) o; if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { - _log.warning(_owner.getName() + ": Attempt to add a restricted item!"); + LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) { - _log.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; } if ((count <= 0) || (count > item.getCount())) { - _log.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); return null; } if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -244,7 +244,7 @@ public class TradeList { if (checkitem.getObjectId() == objectId) { - _log.warning(_owner.getName() + ": Attempt to add an item that is already present!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that is already present!"); return null; } } @@ -268,14 +268,14 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); return null; } @@ -286,13 +286,13 @@ public class TradeList if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -315,13 +315,13 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } if (count < 0) { - _log.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); return null; } @@ -335,7 +335,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return null; } partnerList.invalidateConfirmation(); @@ -410,7 +410,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return false; } @@ -475,7 +475,7 @@ public class TradeList // Check for Owner validity if ((_owner == null) || (L2World.getInstance().getPlayer(_owner.getObjectId()) == null)) { - _log.warning("Invalid owner of TradeList"); + LOGGER.warning("Invalid owner of TradeList"); return false; } @@ -485,7 +485,7 @@ public class TradeList final L2ItemInstance item = _owner.checkItemManipulation(titem.getObjectId(), titem.getCount(), "transfer"); if ((item == null) || (item.getCount() < 1)) { - _log.warning(_owner.getName() + ": Invalid Item in TradeList"); + LOGGER.warning(_owner.getName() + ": Invalid Item in TradeList"); return false; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 755cbf27c0..93b8466f79 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -636,7 +636,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } @@ -694,7 +694,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -807,7 +807,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = getAggroList().get(target); if (ai == null) { - _log.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 944e723989..1ebbe0e5f3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -176,7 +176,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class L2Character extends L2Object implements ISkillsHolder, IDeletable { - public static final Logger _log = Logger.getLogger(L2Character.class.getName()); + public static final Logger LOGGER = Logger.getLogger(L2Character.class.getName()); private volatile Set> _attackByList; @@ -3278,7 +3278,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Temporary fix for character outside world region errors (should not happen) if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) { - _log.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); + LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); if (isPlayer()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 44d799a80a..1342e98ac5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -624,7 +624,7 @@ public class L2Npc extends L2Character } else { - _log.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); } } } @@ -1189,7 +1189,7 @@ public class L2Npc extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } if (isChannelized()) @@ -1560,7 +1560,7 @@ public class L2Npc extends L2Character if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); + LOGGER.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); return null; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java index 94fe6bb6b5..3dd9a9d68e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java @@ -395,7 +395,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed stopMove().", e); + LOGGER.log(Level.SEVERE, "Failed stopMove().", e); } try @@ -404,7 +404,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed oustPlayers().", e); + LOGGER.log(Level.SEVERE, "Failed oustPlayers().", e); } final ZoneRegion oldZoneRegion = ZoneManager.getInstance().getRegion(this); @@ -415,7 +415,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } oldZoneRegion.removeFromZones(this); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java index 8e72579b54..05339545d3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java @@ -61,7 +61,7 @@ public class L2ControlTowerInstance extends L2Tower } catch (Exception e) { - _log.log(Level.WARNING, "Error at L2ControlTowerInstance", e); + LOGGER.log(Level.WARNING, "Error at L2ControlTowerInstance", e); } } _guards.clear(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 6c554e10e0..91548e2a10 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -100,7 +100,7 @@ public class L2DecoyInstance extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } @@ -126,7 +126,7 @@ public class L2DecoyInstance extends L2Character } catch (Throwable e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index f9aa07f44d..97c2348dec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -123,7 +123,7 @@ public class L2DefenderInstance extends L2Attackable if ((_fort == null) && (_castle == null)) { - _log.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); + LOGGER.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 4fb7bbb976..baab09b858 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -219,7 +219,7 @@ public final class L2DoorInstance extends L2Character } else { - _log.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); + LOGGER.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 71096be532..1519fc6308 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -74,14 +74,14 @@ public class L2MerchantInstance extends L2NpcInstance final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } if (!buyList.isNpcAllowed(getId())) { - _log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); + LOGGER.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 2968b22f06..88e3f6c013 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -1327,7 +1327,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Attempted to remove unknown RecipeList: " + recipeId); + LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } for (Shortcut sc : getAllShortCuts()) @@ -1352,7 +1352,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -1368,7 +1368,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -2620,7 +2620,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Skipping null auto-get skill for player: " + toString()); + LOGGER.warning("Skipping null auto-get skill for player: " + toString()); } } } @@ -3272,7 +3272,7 @@ public final class L2PcInstance extends L2Playable final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); + LOGGER.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); return null; } // Sends message to client if requested @@ -3315,7 +3315,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof L2EtcItem ? (L2EtcItem) item : null); if (handler == null) { - _log.warning("No item handler registered for Herb ID " + item.getId() + "!"); + LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!"); } else { @@ -3833,7 +3833,7 @@ public final class L2PcInstance extends L2Playable // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { - _log.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); return null; } @@ -3841,19 +3841,19 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return null; } if ((count < 0) || ((count > 1) && !item.isStackable())) { - _log.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); return null; } if (count > item.getCount()) { - _log.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); return null; } @@ -3882,7 +3882,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_protectEndTime > 0))) { - _log.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _protectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -3892,7 +3892,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_teleportProtectEndTime > 0))) { - _log.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _teleportProtectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -4407,7 +4407,7 @@ public final class L2PcInstance extends L2Playable if (!object.isItem()) { // dont try to pickup anything that is not an item :) - _log.warning(this + " trying to pickup wrong target." + getTarget()); + LOGGER.warning(this + " trying to pickup wrong target." + getTarget()); return; } @@ -4507,7 +4507,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -5169,11 +5169,11 @@ public final class L2PcInstance extends L2Playable if (isKarmaDrop) { - _log.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } else { - _log.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } if (++dropCount >= dropLimit) @@ -6267,7 +6267,7 @@ public final class L2PcInstance extends L2Playable L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level); if (accessLevel == null) { - _log.warning("Can't find access level " + level + " for character " + toString()); + LOGGER.warning("Can't find access level " + level + " for character " + toString()); accessLevel = AdminData.getInstance().getAccessLevel(0); } @@ -6276,7 +6276,7 @@ public final class L2PcInstance extends L2Playable accessLevel = AdminData.getInstance().getAccessLevel(Config.DEFAULT_ACCESS_LEVEL); if (accessLevel == null) { - _log.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); + LOGGER.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); accessLevel = AdminData.getInstance().getAccessLevel(0); Config.DEFAULT_ACCESS_LEVEL = 0; } @@ -6302,7 +6302,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); + LOGGER.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); } } @@ -6310,11 +6310,11 @@ public final class L2PcInstance extends L2Playable if (accessLevel == null) { - _log.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); + LOGGER.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); } else if (level > 0) { - _log.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); + LOGGER.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); } } @@ -6423,7 +6423,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed updating character online status.", e); + LOGGER.log(Level.SEVERE, "Failed updating character online status.", e); } } @@ -6476,7 +6476,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); return false; } return true; @@ -6624,7 +6624,7 @@ public final class L2PcInstance extends L2Playable catch (Exception e) { player.setBaseClass(activeClassId); - _log.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); + LOGGER.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); } // Restore Subclass Data (cannot be done earlier in function) @@ -6647,7 +6647,7 @@ public final class L2PcInstance extends L2Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - _log.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -6788,7 +6788,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed loading character.", e); + LOGGER.log(Level.SEVERE, "Failed loading character.", e); } return player; } @@ -6878,7 +6878,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); } return true; } @@ -6986,7 +6986,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); } } @@ -7016,7 +7016,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); } } @@ -7032,7 +7032,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); } } @@ -7047,7 +7047,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.severe("Could not delete premium item: " + e); + LOGGER.severe("Could not delete premium item: " + e); } } @@ -7165,7 +7165,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); } } @@ -7195,7 +7195,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); } } @@ -7319,7 +7319,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store char effect data: ", e); } } @@ -7351,7 +7351,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char item reuse data: ", e); + LOGGER.log(Level.WARNING, "Could not store char item reuse data: ", e); } } @@ -7440,7 +7440,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); } } @@ -7500,12 +7500,12 @@ public final class L2PcInstance extends L2Playable } // else // { - // _log.warning("Could not store new skill, it's null!"); + // LOGGER.warning("Could not store new skill, it's null!"); // } } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7540,7 +7540,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7568,7 +7568,7 @@ public final class L2PcInstance extends L2Playable if (skill == null) { - _log.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); + LOGGER.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); continue; } @@ -7591,7 +7591,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); } } @@ -7649,7 +7649,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } } @@ -7715,7 +7715,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); } } @@ -7779,7 +7779,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); } // Calculate henna modifiers of this player. @@ -7847,7 +7847,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed removing character henna.", e); + LOGGER.log(Level.SEVERE, "Failed removing character henna.", e); } // Calculate Henna modifiers of this L2PcInstance @@ -7946,7 +7946,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed saving character henna.", e); + LOGGER.log(Level.SEVERE, "Failed saving character henna.", e); } // Task for henna duration @@ -8101,7 +8101,7 @@ public final class L2PcInstance extends L2Playable if (isLocked()) { - _log.warning("Player " + getName() + " tried to restart/logout during class change."); + LOGGER.warning("Player " + getName() + " tried to restart/logout during class change."); return false; } @@ -8452,7 +8452,7 @@ public final class L2PcInstance extends L2Playable if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { - _log.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); + LOGGER.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -9579,7 +9579,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); return false; } @@ -9694,7 +9694,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -9782,7 +9782,7 @@ public final class L2PcInstance extends L2Playable final L2PcTemplate pcTemplate = PlayerTemplateData.getInstance().getTemplate(classId); if (pcTemplate == null) { - _log.severe("Missing template for classId: " + classId); + LOGGER.severe("Missing template for classId: " + classId); throw new Error(); } // Set the template of the L2PcInstance @@ -9865,7 +9865,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -10105,7 +10105,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10117,7 +10117,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogin(this), this); @@ -10602,7 +10602,7 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return false; } @@ -10744,7 +10744,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) @@ -10752,13 +10752,13 @@ public final class L2PcInstance extends L2Playable { if (!isOnline()) { - _log.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); + LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } setOnlineStatus(false, true); } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10770,7 +10770,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10782,7 +10782,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove combat flag @@ -10805,7 +10805,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10818,7 +10818,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10830,7 +10830,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Recommendations must be saved before task (timer) is canceled @@ -10840,7 +10840,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop the HP/MP/CP Regeneration task (scheduled tasks) try @@ -10849,7 +10849,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10858,7 +10858,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop crafting, if in progress @@ -10868,7 +10868,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Cancel Attak or Cast @@ -10878,7 +10878,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isChannelized()) @@ -10899,7 +10899,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // If a Party is in progress, leave it (and festival party) @@ -10911,7 +10911,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10946,7 +10946,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // returns pet to control item } @@ -10964,7 +10964,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10984,7 +10984,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11004,7 +11004,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove player from instance @@ -11017,7 +11017,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11027,7 +11027,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its inventory and remove them from the world @@ -11037,7 +11037,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its warehouse and remove them from the world @@ -11047,7 +11047,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (Config.WAREHOUSE_CACHE) { @@ -11060,7 +11060,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11069,7 +11069,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isCursedWeaponEquipped()) @@ -11080,7 +11080,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11128,7 +11128,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); } // Stop all passives and augment options @@ -11454,7 +11454,7 @@ public final class L2PcInstance extends L2Playable { if (killer == null) { - _log.warning(this + " called calculateShilensBreathDebuffLevel with killer null!"); + LOGGER.warning(this + " called calculateShilensBreathDebuffLevel with killer null!"); return; } @@ -11915,7 +11915,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); + LOGGER.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); } } } @@ -12044,7 +12044,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); } } @@ -12064,7 +12064,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -12213,7 +12213,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); } @@ -12234,7 +12234,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); } } @@ -12453,7 +12453,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); } } @@ -12550,7 +12550,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); + LOGGER.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); } } } @@ -12576,7 +12576,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); } } @@ -12825,12 +12825,12 @@ public final class L2PcInstance extends L2Playable if (nextLevel == -1) { - _log.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from player " + toString()); removeSkill(skill, true); // there is no lower skill } else { - _log.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } @@ -12976,7 +12976,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); } } @@ -13020,7 +13020,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); } } @@ -13040,7 +13040,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); } } @@ -13808,14 +13808,14 @@ public final class L2PcInstance extends L2Playable { sendMessage("The command " + command.substring(6) + " does not exist!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, getAccessLevel())) { sendMessage("You don't have the access rights to use this command!"); - _log.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); + LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 5718895451..ca24302555 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -576,7 +576,7 @@ public class L2PetInstance extends L2Summon final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -771,7 +771,7 @@ public class L2PetInstance extends L2Summon if (removedItem == null) { - _log.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); + LOGGER.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); } else { @@ -1059,7 +1059,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not store pet effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store pet effect data: ", e); } } @@ -1098,7 +1098,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { @@ -1404,7 +1404,7 @@ public class L2PetInstance extends L2Summon } else { - _log.warning("Pet control item null, for pet: " + toString()); + LOGGER.warning("Pet control item null, for pet: " + toString()); } super.setName(name); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 2c113f3992..fcd45fb1b0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -376,7 +376,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store summon effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store summon effect data: ", e); } } @@ -442,7 +442,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index 23ca608434..2fcc796ffa 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -55,7 +55,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2VillageMasterInstance extends L2NpcInstance { - private static Logger _log = Logger.getLogger(L2VillageMasterInstance.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2VillageMasterInstance.class.getName()); public L2VillageMasterInstance(L2NpcTemplate template) { @@ -627,7 +627,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } catch (PatternSyntaxException e) { - _log.warning("ERROR: Wrong pattern for clan name!"); + LOGGER.warning("ERROR: Wrong pattern for clan name!"); pattern = Pattern.compile(".*"); } return pattern.matcher(name).matches(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java index b448f021a8..d2cd097234 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java @@ -93,7 +93,7 @@ public class PetStat extends SummonStat { if (getActiveChar() != null) { - _log.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); + LOGGER.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); } throw e; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index aaecadf5c5..222d29419e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp public class PlayableStat extends CharStat { - protected static final Logger _log = Logger.getLogger(PlayableStat.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PlayableStat.class.getName()); public PlayableStat(L2Playable activeChar) { @@ -195,7 +195,7 @@ public class PlayableStat extends CharStat { if (value < 0) { - _log.warning("wrong usage"); + LOGGER.warning("wrong usage"); return false; } final long currentSp = getSp(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index 352a7719ae..0ce091c546 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.stats.Stats; public class CharStatus { - protected static final Logger _log = Logger.getLogger(CharStatus.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(CharStatus.class.getName()); private final L2Character _activeChar; @@ -449,7 +449,7 @@ public class CharStatus } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java index 3fa6773fd2..1b1003f76d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc; */ public class RandomAnimationTask implements Runnable { - private static final Logger _log = Logger.getLogger(RandomAnimationTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RandomAnimationTask.class.getName()); private final L2Npc _npc; private boolean _stopTask; @@ -70,7 +70,7 @@ public class RandomAnimationTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); + LOGGER.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java index 39eaa5b37a..755ae87ebc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction; */ public class TrapTask implements Runnable { - private static final Logger _log = Logger.getLogger(TrapTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TrapTask.class.getName()); private static final int TICK = 1000; // 1s private final L2TrapInstance _trap; @@ -65,7 +65,7 @@ public class TrapTask implements Runnable } catch (Exception e) { - _log.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); _trap.unSummon(); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java index 1801510a6b..a08fc73212 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.LeaveWorld; */ public class GameGuardCheckTask implements Runnable { - private static final Logger _log = Logger.getLogger(GameGuardCheckTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GameGuardCheckTask.class.getName()); private final L2PcInstance _player; @@ -47,7 +47,7 @@ public class GameGuardCheckTask implements Runnable if ((client != null) && !client.isAuthedGG() && _player.isOnline()) { AdminData.getInstance().broadcastMessageToGMs("Client " + client + " failed to reply GameGuard query and is being kicked!"); - _log.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); + LOGGER.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); client.close(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 23cfffc2bb..fc78d6a4db 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.Disconnection; */ public final class IllegalPlayerActionTask implements Runnable { - private static final Logger _log = Logger.getLogger("audit"); + private static final Logger LOGGER = Logger.getLogger("audit"); private final String _message; private final IllegalActionPunishmentType _punishment; @@ -74,7 +74,7 @@ public final class IllegalPlayerActionTask implements Runnable @Override public void run() { - _log.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); + LOGGER.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); AdminData.getInstance().broadcastMessageToGMs(_message); if (!_actor.isGM()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index 8b4bd27212..73c3219140 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PetFeedTask implements Runnable { - private static final Logger _log = Logger.getLogger(PetFeedTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PetFeedTask.class.getName()); private final L2PcInstance _player; @@ -99,7 +99,7 @@ public class PetFeedTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); + LOGGER.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/Announcement.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/Announcement.java index 3873f71d14..4e5aa84b0f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/Announcement.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/Announcement.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class Announcement implements IAnnouncement { - protected static final Logger _log = Logger.getLogger(Announcement.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Announcement.class.getName()); private static final String INSERT_QUERY = "INSERT INTO announcements (type, content, author) VALUES (?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE announcements SET type = ?, content = ?, author = ? WHERE id = ?"; @@ -125,7 +125,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -145,7 +145,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -162,7 +162,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java index f85c9affc0..a18af9fc50 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,7 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; - private static final Logger _log = Logger.getLogger(AnnouncementType.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) { @@ -40,7 +40,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); return NORMAL; } @@ -53,7 +53,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); return NORMAL; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index a47ba1a0a5..ebee3cd82c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -114,7 +114,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -137,7 +137,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/buylist/Product.java index 97571235ed..03b1a51b6b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; */ public final class Product { - private static final Logger _log = Logger.getLogger(Product.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Product.class.getName()); private final int _buyListId; private final L2Item _item; @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - _log.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index 8d2e52b55c..6eefb3679e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public final class ConditionPlayerGrade extends Condition { - protected static final Logger _log = Logger.getLogger(ConditionPlayerGrade.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ConditionPlayerGrade.class.getName()); // conditional values public static final int COND_NO_GRADE = 0x0001; public static final int COND_D_GRADE = 0x0002; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 90ac2108aa..805960c36b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public abstract class AbstractEffect { - protected static final Logger _log = Logger.getLogger(AbstractEffect.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEffect.class.getName()); private int _ticks; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index 6892d0798a..ce7a68dcc7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -56,7 +56,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class BlockCheckerEngine { - protected static final Logger _log = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -309,7 +309,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); + LOGGER.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); } } @@ -417,7 +417,7 @@ public final class BlockCheckerEngine // Wrong arena passed, stop event if (_arena == -1) { - _log.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); + LOGGER.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); return; } _isStarted = true; @@ -508,7 +508,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Spawn the block carrying girl @@ -530,8 +530,8 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } @@ -558,7 +558,7 @@ public final class BlockCheckerEngine { if (_spawn == null) { - _log.warning("HBCE: Block Carrying Girl is null"); + LOGGER.warning("HBCE: Block Carrying Girl is null"); return; } SpawnTable.getInstance().deleteSpawn(_spawn, false); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java index a6faf0b0df..4fa38d85d4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public final class Castle extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Castle.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Castle.class.getName()); private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); @@ -212,7 +212,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -232,7 +232,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; } @@ -542,7 +542,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } oldOwner.setCastleId(0); // Unset has castle flag for old owner for (L2PcInstance member : oldOwner.getOnlineMembers(0)) @@ -683,7 +683,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); } } @@ -704,7 +704,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); } } @@ -724,7 +724,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -801,7 +801,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); } } @@ -821,7 +821,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -848,7 +848,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); } } } @@ -891,7 +891,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -1042,7 +1042,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); } } @@ -1086,7 +1086,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -1110,7 +1110,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); } } final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(getResidenceId()).get(towerIndex); @@ -1135,7 +1135,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -1184,7 +1184,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); return; } spawn.setX(holder.getX()); @@ -1219,7 +1219,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } _castleSide = side; Broadcast.toAllOnlinePlayers(new ExCastleState(this)); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Couple.java index c31232e232..c40e7d454a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Couple.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class Couple { - private static final Logger _log = Logger.getLogger(Couple.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Couple.class.getName()); private int _Id = 0; private int _player1Id = 0; @@ -67,7 +67,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); } } @@ -99,7 +99,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); } } @@ -117,7 +117,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); } } @@ -131,7 +131,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Duel.java index d601203f8d..826a7beece 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class Duel { - protected static final Logger _log = Logger.getLogger(Duel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Duel.class.getName()); public static final int DUELSTATE_NODUEL = 0; public static final int DUELSTATE_DUELLING = 1; @@ -223,7 +223,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); } } } @@ -266,7 +266,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); } } } @@ -291,7 +291,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); } } } @@ -994,7 +994,7 @@ public class Duel { if ((player != _playerA) && (player != _playerB)) { - _log.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); + LOGGER.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); } if (_playerA == player) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java index 75ec9236b8..aaece02dae 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Fort extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Fort.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Fort.class.getName()); private final List _doors = new ArrayList<>(); private L2StaticObjectInstance _flagPole = null; @@ -227,7 +227,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Fort extends AbstractResidence { if (clan == null) { - _log.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); + LOGGER.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); return false; } @@ -396,7 +396,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } removeOwner(true); } @@ -496,7 +496,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); } } @@ -606,7 +606,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } @@ -627,7 +627,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); } } @@ -647,7 +647,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -744,7 +744,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -775,7 +775,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); } } @@ -844,7 +844,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -968,7 +968,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); } } } @@ -1008,7 +1008,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); } } @@ -1154,7 +1154,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1183,7 +1183,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1213,7 +1213,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1249,7 +1249,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 053af69e9d..80e02260d5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class FortSiege implements Siegable { - protected static final Logger _log = Logger.getLogger(FortSiege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortSiege.class.getName()); // SQL private static final String DELETE_FORT_SIEGECLANS_BY_CLAN_ID = "DELETE FROM fortsiege_clans WHERE fort_id = ? AND clan_id = ?"; @@ -82,7 +82,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -169,12 +169,12 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); + LOGGER.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); } } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); } } } @@ -195,7 +195,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -218,7 +218,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -293,7 +293,7 @@ public class FortSiege implements Siegable getFort().setVisibleFlag(true); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -343,7 +343,7 @@ public class FortSiege implements Siegable announceToPlayer(sm); saveFortSiege(); - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -533,7 +533,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -689,7 +689,7 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); } } } @@ -816,7 +816,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); } } @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new FortSiege.ScheduleStartSiegeTask(60), 0); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); } } } @@ -1013,7 +1013,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1066,7 +1066,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1092,7 +1092,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); } } @@ -1120,7 +1120,7 @@ public class FortSiege implements Siegable catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/L2Event.java index be28d47897..dbdbdae0e9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/L2Event.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/L2Event.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class L2Event { - protected static final Logger _log = Logger.getLogger(L2Event.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2Event.class.getName()); public static EventState eventState = EventState.OFF; public static String _eventName = ""; public static String _eventCreator = ""; @@ -151,7 +151,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); } } } @@ -187,7 +187,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); } } @@ -308,7 +308,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); } } @@ -399,7 +399,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event participation, an error has occured."; } @@ -475,7 +475,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event, an error has occured."; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Siege.java index 0c7d996da0..bd0fbb0975 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class Siege implements Siegable { - protected static final Logger _log = Logger.getLogger(Siege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Siege.class.getName()); // typeId's public static final byte OWNER = -1; @@ -142,7 +142,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -215,7 +215,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -781,7 +781,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -798,7 +798,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); } } @@ -983,7 +983,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); } } @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - _log.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); loadSiegeClan(); @@ -1275,7 +1275,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1360,7 +1360,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1428,7 +1428,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); } } @@ -1482,7 +1482,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); } _controlTowerCount = _controlTowers.size(); } @@ -1506,7 +1506,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 26d733e4c1..12551f22ba 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -161,7 +161,7 @@ import com.l2jmobius.gameserver.util.MinionList; */ public abstract class AbstractScript extends ManagedScript implements IEventTimerEvent, IEventTimerCancel { - protected static final Logger _log = Logger.getLogger(AbstractScript.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractScript.class.getName()); private final Map> _registeredIds = new ConcurrentHashMap<>(); private final Queue _listeners = new PriorityBlockingQueue<>(); private volatile TimerExecutor _timerExecutor; @@ -185,7 +185,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime public void onTimerEvent(String event, StatsSet params, L2Npc npc, L2PcInstance player) { - _log.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); + LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } public void onTimerCancel(String event, StatsSet params, L2Npc npc, L2PcInstance player) @@ -229,17 +229,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final EventType eventType = listener.value(); if (method.getParameterCount() != 1) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); continue; } else if (!eventType.isEventClass(method.getParameterTypes()[0])) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); continue; } else if (!eventType.isReturnClass(method.getReturnType())) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); continue; } @@ -275,7 +275,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final Range range = (Range) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -291,7 +291,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -306,12 +306,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final NpcLevelRange range = (NpcLevelRange) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -329,12 +329,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -391,7 +391,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -409,7 +409,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -499,7 +499,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -517,7 +517,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -536,7 +536,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -553,7 +553,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -596,7 +596,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -613,7 +613,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -633,7 +633,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -651,7 +651,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -671,7 +671,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -689,7 +689,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -709,7 +709,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -727,7 +727,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -1018,7 +1018,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1036,7 +1036,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1723,7 +1723,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } @@ -1843,7 +1843,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } } @@ -2216,7 +2216,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime if ((x == 0) && (y == 0)) { - _log.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); + LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); return null; } @@ -2258,7 +2258,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } catch (Exception e) { - _log.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); + LOGGER.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); } return null; @@ -3138,7 +3138,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (!door.isOpen()) { @@ -3156,7 +3156,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (door.isOpen()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java index c25f5189f6..231cef15b4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public final class EventDispatcher { - private static final Logger _log = Logger.getLogger(EventDispatcher.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EventDispatcher.class.getName()); protected EventDispatcher() { @@ -83,7 +83,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -172,7 +172,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -237,7 +237,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java index 4b21e92c36..97dc1b1142 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class AnnotationEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(AnnotationEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnotationEventListener.class.getName()); private final Method _callback; public AnnotationEventListener(ListenersContainer container, EventType type, Method callback, Object owner, int priority) @@ -54,7 +54,7 @@ public class AnnotationEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java index 0d5b4a601c..56fb7b03ec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class FunctionEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(FunctionEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FunctionEventListener.class.getName()); private final Function _callback; @SuppressWarnings("unchecked") @@ -50,7 +50,7 @@ public class FunctionEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index cb65209f93..1501c166e8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public abstract class ItemContainer { - protected static final Logger _log = Logger.getLogger(ItemContainer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ItemContainer.class.getName()); protected final Map _items = new ConcurrentHashMap<>(); @@ -287,7 +287,7 @@ public abstract class ItemContainer final L2Item template = ItemTable.getInstance().getTemplate(itemId); if (template == null) { - _log.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); + LOGGER.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); return null; } @@ -702,7 +702,7 @@ public abstract class ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index cb2d9362ba..5bb5770412 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -139,7 +139,7 @@ public class Mail extends ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index 05301a69a5..3dbb712a6b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; public class PcInventory extends Inventory { - private static final Logger _log = Logger.getLogger(PcInventory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PcInventory.class.getName()); private final L2PcInstance _owner; private L2ItemInstance _adena; @@ -761,7 +761,7 @@ public class PcInventory extends Inventory } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); } return paperdoll; } @@ -970,7 +970,7 @@ public class PcInventory extends Inventory { if ((type != EtcItemType.ARROW) && (type != EtcItemType.BOLT)) { - _log.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); + LOGGER.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java index 37e0216702..ded347d03a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java @@ -71,7 +71,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "addItem()", e); + LOGGER.log(Level.SEVERE, "addItem()", e); } } @@ -93,7 +93,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } _items.clear(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index a988fe1fec..c5a70ee9be 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.items.type.ItemType; */ public abstract class AbstractEnchantItem { - protected static final Logger _log = Logger.getLogger(AbstractEnchantItem.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); private static final ItemType[] ENCHANT_TYPES = new ItemType[] { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java index d4af9b02f5..2a7e5652dc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.holders.RangeChanceHolder; */ public final class EnchantItemGroup { - private static final Logger _log = Logger.getLogger(EnchantItemGroup.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); private final List _chances = new ArrayList<>(); private final String _name; @@ -68,10 +68,10 @@ public final class EnchantItemGroup return holder.getChance(); } } - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); return _chances.get(_chances.size() - 1).getChance(); } - _log.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); return -1; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index f7595701a1..98cb998ee2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -142,14 +142,14 @@ public final class EnchantScroll extends AbstractEnchantItem { if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) { - _log.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); return -1; } final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); if (group == null) { - _log.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); return -1; } return group.getChance(enchantItem.getEnchantLevel()); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index de53a8d9da..67acdf20f6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -1274,7 +1274,7 @@ public final class L2ItemInstance extends L2Object */ public static class ScheduleConsumeManaTask implements Runnable { - private static final Logger _log = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); private final L2ItemInstance _shadowItem; public ScheduleConsumeManaTask(L2ItemInstance item) @@ -1295,7 +1295,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 7556af343a..46097d99e5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public abstract class AbstractOlympiadGame { - protected static final Logger _log = Logger.getLogger(AbstractOlympiadGame.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractOlympiadGame.class.getName()); protected static final Logger _logResults = Logger.getLogger("olympiad"); protected static final String POINTS = "olympiad_points"; @@ -186,7 +186,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return false; } return true; @@ -287,7 +287,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -340,7 +340,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -387,7 +387,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "playerStatusBack()", e); + LOGGER.log(Level.WARNING, "playerStatusBack()", e); } } @@ -434,7 +434,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java index 6069b35ec8..714e479916 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OlympiadGameManager implements Runnable { - private static final Logger _log = Logger.getLogger(OlympiadGameManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlympiadGameManager.class.getName()); private static final int STADIUM_COUNT = 80; // TODO dynamic private volatile boolean _battleStarted = false; @@ -60,7 +60,7 @@ public class OlympiadGameManager implements Runnable _tasks.add(stadium); } - _log.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); + LOGGER.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); } public static OlympiadGameManager getInstance() @@ -188,7 +188,7 @@ public class OlympiadGameManager implements Runnable { OlympiadManager.getInstance().clearRegistered(); _battleStarted = false; - _log.info("Olympiad System: All current games finished."); + LOGGER.info("Olympiad System: All current games finished."); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 2108adfcb2..c82b326970 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -167,7 +167,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return false; } return result; @@ -388,7 +388,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (_playerTwo.isDefaulted()) @@ -415,7 +415,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (winside == 1) @@ -431,7 +431,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -536,7 +536,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -673,7 +673,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (SQLException e) { - _log.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); + LOGGER.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index d18e278286..8ef4db814e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class OlympiadGameTask implements Runnable { - protected static final Logger _log = Logger.getLogger(OlympiadGameTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(OlympiadGameTask.class.getName()); private static final int[] TELEPORT_TO_ARENA_TIMES = { @@ -163,7 +163,7 @@ public final class OlympiadGameTask implements Runnable { if ((game != null) && (_state != GameState.IDLE)) { - _log.warning("Attempt to overwrite non-finished game in state " + _state); + LOGGER.warning("Attempt to overwrite non-finished game in state " + _state); return; } @@ -352,14 +352,14 @@ public final class OlympiadGameTask implements Runnable case CLEANUP: case IDLE: { - _log.warning("Unable to return players back in town, exception: " + e.getMessage()); + LOGGER.warning("Unable to return players back in town, exception: " + e.getMessage()); _state = GameState.IDLE; _game = null; return; } } - _log.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); _state = GameState.GAME_STOPPED; ThreadPool.schedule(this, 1000); } @@ -417,7 +417,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -446,7 +446,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -463,7 +463,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; @@ -480,7 +480,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -489,7 +489,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -498,7 +498,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -507,7 +507,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -522,7 +522,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -531,7 +531,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -540,7 +540,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -549,7 +549,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -558,7 +558,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index d4720828f5..037b43e894 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; */ public class PunishmentTask implements Runnable { - protected static final Logger _log = Logger.getLogger(PunishmentTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PunishmentTask.class.getName()); private static final String INSERT_QUERY = "INSERT INTO punishments (`key`, `affect`, `type`, `expiration`, `reason`, `punishedBy`) VALUES (?, ?, ?, ?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE punishments SET expiration = ? WHERE id = ?"; @@ -203,7 +203,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); } } @@ -230,7 +230,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 495a0d648b..0a5994e0d5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class LongTimeEvent extends Quest { - protected Logger _log = Logger.getLogger(getClass().getName()); + protected Logger LOGGER = Logger.getLogger(getClass().getName()); protected String _eventName; boolean _enableShrines = false; @@ -86,17 +86,17 @@ public class LongTimeEvent extends Quest if (_eventPeriod.isWithinRange(new Date())) { startEvent(); - _log.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); + LOGGER.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); } else if (_eventPeriod.getStartDate().after(new Date())) { final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); - _log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); + LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } else { - _log.info("Event " + _eventName + " has passed... Ignored "); + LOGGER.info("Event " + _eventName + " has passed... Ignored "); } } } @@ -179,19 +179,19 @@ public class LongTimeEvent extends Quest if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); continue; } if (minCount > maxCount) { - _log.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); continue; } if ((finalChance < 10000) || (finalChance > 1000000)) { - _log.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); continue; } @@ -199,7 +199,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); } } } @@ -221,7 +221,7 @@ public class LongTimeEvent extends Quest if (NpcData.getInstance().getTemplate(npcId) == null) { - _log.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); + LOGGER.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); continue; } @@ -229,7 +229,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java index a462adcc3a..1d379cf949 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -83,7 +83,7 @@ import com.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class Quest extends AbstractScript implements IIdentifiable { - public static final Logger _log = Logger.getLogger(Quest.class.getName()); + public static final Logger LOGGER = Logger.getLogger(Quest.class.getName()); /** Map containing lists of timers from the name of the timer. */ private volatile Map> _questTimers = null; @@ -521,7 +521,7 @@ public class Quest extends AbstractScript implements IIdentifiable { showError(trigger.getActingPlayer(), e); } - _log.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); return; } if (trigger.getActingPlayer() != null) @@ -541,7 +541,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); } } @@ -556,7 +556,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); } } @@ -862,7 +862,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); } } @@ -931,7 +931,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); } } @@ -946,7 +946,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); } } @@ -961,7 +961,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); } } @@ -976,7 +976,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); } } @@ -993,7 +993,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); } return false; } @@ -1006,7 +1006,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); return; } } @@ -1511,10 +1511,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public boolean showError(L2PcInstance player, Throwable t) { - _log.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); + LOGGER.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); if (t.getMessage() == null) { - _log.warning(getClass().getSimpleName() + ": " + t.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + t.getMessage()); } if ((player != null) && player.getAccessLevel().isGm()) { @@ -1605,7 +1605,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - _log.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1636,7 +1636,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - _log.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); @@ -1654,7 +1654,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1678,7 +1678,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1701,7 +1701,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not update char quest:", e); + LOGGER.log(Level.WARNING, "could not update char quest:", e); } } @@ -1722,7 +1722,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Unable to delete char quest!", e); + LOGGER.log(Level.WARNING, "Unable to delete char quest!", e); } } @@ -1746,7 +1746,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete char quest:", e); + LOGGER.log(Level.WARNING, "could not delete char quest:", e); } } @@ -2802,7 +2802,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if ((id != 0) && (ItemTable.getInstance().getTemplate(id) == null)) { - _log.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); } } _questItemIds = items; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 23c0acc8d1..40aa1878fd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.util.Util; */ public final class QuestState { - protected static final Logger _log = Logger.getLogger(QuestState.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestState.class.getName()); /** The name of the quest of this QuestState */ private final String _questName; @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - _log.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - _log.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 64f6afb219..4013de0733 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class QuestTimer { - protected static final Logger _log = Logger.getLogger(QuestTimer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestTimer.class.getName()); public class ScheduleTimerTask implements Runnable { @@ -48,7 +48,7 @@ public class QuestTimer } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java index 64f04389a2..1c7ac4a6ab 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance; */ public class L2ShuttleEngine implements Runnable { - private static final Logger _log = Logger.getLogger(L2ShuttleEngine.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2ShuttleEngine.class.getName()); private static final int DELAY = 15 * 1000; @@ -117,7 +117,7 @@ public class L2ShuttleEngine implements Runnable } catch (Exception e) { - _log.log(Level.INFO, e.getMessage(), e); + LOGGER.log(Level.INFO, e.getMessage(), e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java index 6148235551..19a1a61b20 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Skill implements IIdentifiable { - private static final Logger _log = Logger.getLogger(Skill.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Skill.class.getName()); /** Skill ID. */ private final int _id; @@ -295,7 +295,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); + LOGGER.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); } } } @@ -426,7 +426,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); + LOGGER.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); } } } @@ -1139,7 +1139,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); } } activeChar.sendMessage("Target type of skill " + this + " is not currently handled."); @@ -1168,7 +1168,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); } } activeChar.sendMessage("Target affect scope of skill " + this + " is not currently handled."); @@ -1196,7 +1196,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); } } else @@ -1608,7 +1608,7 @@ public final class Skill implements IIdentifiable } else { - _log.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); + LOGGER.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 66b9f7e4b2..8e607be078 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SkillChannelizer implements Runnable { - private static final Logger _log = Logger.getLogger(SkillChannelizer.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SkillChannelizer.class.getName()); private final L2Character _channelizer; private List _channelized; @@ -72,7 +72,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); + LOGGER.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); return; } @@ -86,7 +86,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (!isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); + LOGGER.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); return; } @@ -192,7 +192,7 @@ public class SkillChannelizer implements Runnable final Skill channeledSkill = SkillData.getInstance().getSkill(skill.getChannelingSkillId(), skillLevel); if (channeledSkill == null) { - _log.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); + LOGGER.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); _channelizer.abortCast(); return; } @@ -229,7 +229,7 @@ public class SkillChannelizer implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); + LOGGER.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java index 7d6f856c18..8b91fc77d2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class AccountVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(AccountVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AccountVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM account_gsdata WHERE account_name = ?"; @@ -64,7 +64,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); return false; } finally @@ -107,7 +107,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); return false; } finally @@ -134,7 +134,7 @@ public class AccountVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); return false; } return true; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java index 390e2f166a..50fcf2ab6f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ClanVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ClanVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM clan_variables WHERE clanId = ?"; @@ -64,7 +64,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -107,7 +107,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -134,7 +134,7 @@ public class ClanVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java index bcd7f557fd..c7ba2ff071 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ItemVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ItemVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM item_variables WHERE id = ?"; @@ -69,7 +69,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); + LOGGER.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); return false; } return true; @@ -93,7 +93,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -136,7 +136,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -163,7 +163,7 @@ public class ItemVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java index 2bd4da37cf..de6f796ad4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class PlayerVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(PlayerVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PlayerVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM character_variables WHERE charId = ?"; @@ -90,7 +90,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); return false; } finally @@ -133,7 +133,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); return false; } finally @@ -160,7 +160,7 @@ public class PlayerVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); return false; } return true; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java index 8a54b645b0..adfcec2ca5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java @@ -66,7 +66,7 @@ public abstract class L2ZoneRespawn extends L2ZoneType } default: { - _log.warning(getClass().getSimpleName() + ": Unknown location type: " + type); + LOGGER.warning(getClass().getSimpleName() + ": Unknown location type: " + type); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 3beea85891..a6790a61d9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public abstract class L2ZoneType extends ListenersContainer { - protected static final Logger _log = Logger.getLogger(L2ZoneType.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2ZoneType.class.getName()); private final int _id; protected L2ZoneForm _zone; @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - _log.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 043a66b6f4..33d3bb8723 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -113,7 +113,7 @@ public final class L2EffectZone extends L2ZoneType final String[] skillSplit = skill.split("-"); if (skillSplit.length != 2) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); } else { @@ -125,7 +125,7 @@ public final class L2EffectZone extends L2ZoneType { if (!skill.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/L2GameClient.java index 56940c6507..7cdbe1bb0a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -63,7 +63,7 @@ import io.netty.channel.ChannelHandlerContext; public final class L2GameClient extends ChannelInboundHandler { protected static final Logger LOGGER = Logger.getLogger(L2GameClient.class.getName()); - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private final int _objectId; @@ -111,13 +111,13 @@ public final class L2GameClient extends ChannelInboundHandler final InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); _addr = address.getAddress(); _channel = ctx.channel(); - LOG_ACCOUNTING.finer("Client Connected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Connected: " + ctx.channel()); } @Override public void channelInactive(ChannelHandlerContext ctx) { - LOG_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); LoginServerThread.getInstance().sendLogout(getAccountName()); IdFactory.getInstance().releaseId(getObjectId()); @@ -339,7 +339,7 @@ public final class L2GameClient extends ChannelInboundHandler } } - LOG_ACCOUNTING.info("Delete, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Delete, " + objectId + ", " + this); return CharacterDeleteFailType.NONE; } @@ -362,7 +362,7 @@ public final class L2GameClient extends ChannelInboundHandler LOGGER.log(Level.SEVERE, "Error restoring character.", e); } - LOG_ACCOUNTING.info("Restore, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Restore, " + objectId + ", " + this); } public static void deleteCharByObjId(int objid) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/NpcStringId.java index d163570c9b..71de19a55a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/NpcStringId.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { - private static final Logger _log = Logger.getLogger(NpcStringId.class.getName()); + private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; private static Map VALUES = new HashMap<>(); @@ -33112,7 +33112,7 @@ public final class NpcStringId } catch (Exception e) { - _log.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); + LOGGER.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Action.java index f92d2c5e23..6c3399eea7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Action.java @@ -154,7 +154,7 @@ public final class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - _log.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); + LOGGER.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 3159a555e3..1ffd75d20c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -58,7 +58,7 @@ public final class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - _log.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +68,7 @@ public final class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - _log.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 2471b37509..969aea0360 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.util.Util; @SuppressWarnings("unused") public final class CharacterCreate implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cSdddddddddddd private String _name; @@ -124,7 +124,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - _log.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -132,7 +132,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - _log.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -140,7 +140,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairColor > 3) || (_hairColor < 0)) { - _log.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -252,7 +252,7 @@ public final class CharacterCreate implements IClientIncomingPacket initNewChar(client, newChar); - LOG_ACCOUNTING.info("Created new character, " + newChar + ", " + client); + LOGGER_ACCOUNTING.info("Created new character, " + newChar + ", " + client); } private static boolean isValidName(String text) @@ -308,7 +308,7 @@ public final class CharacterCreate implements IClientIncomingPacket final L2ItemInstance item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - _log.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index cd62eefdba..1dab2d81f8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -75,7 +75,7 @@ public final class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error:", e); + LOGGER.log(Level.SEVERE, "Error:", e); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index c7b59f3d6d..3d0b8dfcb3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ServerClose; */ public class CharacterSelect implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cd private int _charSlot; @@ -175,7 +175,7 @@ public class CharacterSelect implements IClientIncomingPacket client.getActiveCharLock().unlock(); } - LOG_ACCOUNTING.info("Logged in, " + client); + LOGGER_ACCOUNTING.info("Logged in, " + client); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5c18755798..689f42e143 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public final class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = activeChar.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - _log.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } activeChar.stopMovie(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 51a0e763ba..e41e04209a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -137,7 +137,7 @@ public class EnterWorld implements IClientIncomingPacket final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { - _log.warning("EnterWorld failed! activeChar returned 'null'."); + LOGGER.warning("EnterWorld failed! activeChar returned 'null'."); Disconnection.of(client).defaultSequence(false); return; } @@ -168,7 +168,7 @@ public class EnterWorld implements IClientIncomingPacket // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) // { - // _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); + // LOGGER.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); // } if (Config.PVP_COLOR_SYSTEM_ENABLED && !Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 29a07243b9..7638c7332e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -43,9 +43,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("[T1:ExGetOnAirShip] x: " + _x); - _log.info("[T1:ExGetOnAirShip] y: " + _y); - _log.info("[T1:ExGetOnAirShip] z: " + _z); - _log.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + 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); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index 4f62846be3..c9f4c0b539 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index 472f1051b3..b0f55887ee 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -27,5 +27,5 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger _log = Logger.getLogger(IClientIncomingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java index 8b2f68f220..d29291657e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class Logout implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -55,7 +55,7 @@ public final class Logout implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 609397a42c..467fda7228 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -131,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) { - _log.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - _log.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -162,7 +162,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - _log.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -327,7 +327,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -425,7 +425,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -574,7 +574,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c9e6a88cec..6d400a1191 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.KeyPacket; */ public final class ProtocolVersion implements IClientIncomingPacket { - private static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + private static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private int _version; @@ -51,7 +51,7 @@ public final class ProtocolVersion implements IClientIncomingPacket } else if (!Config.PROTOCOL_LIST.contains(_version)) { - LOG_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); + LOGGER_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); client.setProtocolOk(false); client.close(new KeyPacket(client.enableCrypt(), 0)); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 1b7a1fff45..c5e512b380 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -106,7 +106,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 100) || (_id < 1) || (_id > 32000)) { Util.handleIllegalPlayerAction(activeChar, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - _log.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); return; } @@ -125,7 +125,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - _log.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -135,7 +135,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); return; } @@ -517,7 +517,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } default: { - _log.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index daaae05884..4feb5ae11d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -56,7 +56,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -80,7 +80,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - _log.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } @@ -90,11 +90,11 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); } else if (prevSkillLevel != (_level - 1)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index baddc853ee..b54bca60ed 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -93,7 +93,7 @@ public final class RequestActionUse implements IClientIncomingPacket if (!(Arrays.binarySearch(allowedActions, _actionId) >= 0)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); + LOGGER.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); return; } } @@ -143,7 +143,7 @@ public final class RequestActionUse implements IClientIncomingPacket } default: { - _log.warning(activeChar.getName() + ": unhandled action type " + _actionId); + LOGGER.warning(activeChar.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 01c8b0c67f..138c70f9d8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -131,7 +131,7 @@ public final class RequestBlock implements IClientIncomingPacket } default: { - _log.info("Unknown 0xA9 block type: " + _type); + LOGGER.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 6f572174ad..d67b7b4d1c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -161,7 +161,7 @@ public final class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - _log.warning("ERROR, no price found .. wrong buylist ??"); + LOGGER.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index a85b1019cc..7621a7029e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -86,7 +86,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty bypass!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty bypass!"); Disconnection.of(client, activeChar).defaultSequence(false); return; } @@ -107,7 +107,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket bypassOriginId = activeChar.validateHtmlAction(_command); if (bypassOriginId == -1) { - _log.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); + LOGGER.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); return; } @@ -192,7 +192,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); } } else if (_command.startsWith("_match")) @@ -285,13 +285,13 @@ public final class RequestBypassToServer implements IClientIncomingPacket } else { - _log.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - _log.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); + LOGGER.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); if (activeChar.isGM()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 8d17f67975..61b88962de 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -61,7 +61,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket if (activeChar == null) { - _log.finer("RequestCrystalizeItem: activeChar was null"); + LOGGER.finer("RequestCrystalizeItem: activeChar was null"); return; } @@ -90,7 +90,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((activeChar.getRace() != Race.DWARF) && (activeChar.getClassId().ordinal() != 117) && (activeChar.getClassId().ordinal() != 55)) { - _log.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); + LOGGER.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); } return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index f48efc3a6d..9805ae3e39 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -171,7 +171,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not delete pet objectid: ", e); + LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 2c89d4fd7e..33c87254a1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -185,7 +185,7 @@ public final class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - _log.warning(msg); + LOGGER.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index ac44a0a77b..2bbdb8626a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -42,6 +42,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 27e73c4de3..94fc6eac8a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -74,7 +74,7 @@ public final class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - _log.warning("Wrong Cube Game Team ID: " + _team); + LOGGER.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index ca230610ed..ea96e75807 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -64,7 +64,7 @@ public final class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - _log.warning("Unknown Cube Game Answer ID: " + _answer); + LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index 2aac09d8a2..87679b1211 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -34,6 +34,6 @@ public final class RequestExFishRanking implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestExFishRanking"); + LOGGER.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 1690c6d2f0..412be1caa7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -87,7 +87,7 @@ public final class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 31e55b54f3..0937ce580d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -72,7 +72,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - _log.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 352bc99c12..c031e965ea 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -43,7 +43,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - _log.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); + LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); if (client.getActiveChar() == null) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index 8c3b8157b7..d480f5057e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -44,6 +44,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - _log.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + LOGGER.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index ffc9040acd..0feb646e91 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -79,7 +79,7 @@ public final class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index ee5433c9e0..186e2f91a4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -119,7 +119,7 @@ public final class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 431f1db994..0f0b002fed 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -72,7 +72,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 4055e9b188..016c2378d4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -52,7 +52,7 @@ public final class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - _log.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); } client.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 6950da9b0c..a9704d4032 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -50,7 +50,7 @@ public final class RequestHennaItemRemoveInfo implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 0e427d5138..7c62b7cd89 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -75,7 +75,7 @@ public final class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - _log.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); + LOGGER.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); client.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index d8a598fa60..53afe57b35 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -49,20 +49,20 @@ public final class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - _log.warning("Player " + actor.getName() + " sent empty html link!"); + LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - _log.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - _log.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 3d797b889a..c8a621359f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -50,7 +50,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (activeChar.getObjectId() != _objectId) { - _log.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + LOGGER.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 1f6b539929..cab42128f7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public final class RequestMagicSkillUse implements IClientIncomingPacket activeChar.sendPacket(ActionFailed.STATIC_PACKET); if (_magicId > 0) { - _log.warning("Skill Id " + _magicId + " not found in player: " + activeChar); + LOGGER.warning("Skill Id " + _magicId + " not found in player: " + activeChar); } return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 0ab61c25b8..11ed417b33 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -72,7 +72,7 @@ public final class RequestOustPledgeMember implements IClientIncomingPacket final L2ClanMember member = clan.getClanMember(_target); if (member == null) { - _log.warning("Target (" + _target + ") is not member of the clan"); + LOGGER.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayerInstance().isInCombat()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index b703480e20..b87741c610 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -37,6 +37,6 @@ public final class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestPCCafeCouponUse: S: " + _str); + LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index aa71b73eb6..05962263f7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -119,7 +119,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -168,7 +168,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -176,7 +176,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 9ef482c27c..57d27eec76 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -136,7 +136,7 @@ public final class RequestPetUseItem implements IClientIncomingPacket else { activeChar.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - _log.warning("No item handler registered for itemId: " + item.getId()); + LOGGER.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index deef71c1ba..29ab10a108 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -74,7 +74,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - _log.severe("Error while saving petition feedback"); + LOGGER.severe("Error while saving petition feedback"); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 7e97a40c3f..432d30d9aa 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -74,7 +74,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -153,7 +153,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket final L2MerchantInstance merchant = (target instanceof L2MerchantInstance) ? (L2MerchantInstance) target : null; if (merchant == null) { - _log.warning("Null merchant!"); + LOGGER.warning("Null merchant!"); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index b6f2892f96..a20bb3d197 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -160,7 +160,7 @@ public final class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - _log.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 536446bb1d..7406f63592 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -138,7 +138,7 @@ public final class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9ab82245e8..01373d760d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -194,7 +194,7 @@ public final class RequestRefundItem implements IClientIncomingPacket final L2ItemInstance item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - _log.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); continue; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 8b253257c5..1a4ea38608 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack } else { - _log.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } activeChar.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 23c4edd13c..f8749dfd8b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class RequestRestart implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -58,7 +58,7 @@ public final class RequestRestart implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 7ba8a189b4..e08c984b59 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -91,7 +91,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else if (!activeChar.isDead()) { - _log.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); + LOGGER.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); return; } @@ -143,7 +143,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getHideoutId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CLANHALL); @@ -171,7 +171,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -194,7 +194,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getFortId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.FORTRESS); @@ -223,7 +223,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.SIEGEFLAG); @@ -233,7 +233,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if (!activeChar.isGM() && !activeChar.getInventory().haveItemForSelfResurrection()) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (activeChar.isGM() || activeChar.destroyItemByItemId("Feather", 10649, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13300, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13128, 1, activeChar, false)) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9cbb114e88..e53df987df 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -323,14 +323,14 @@ public final class RequestSendPost implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - _log.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final L2ItemInstance newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - _log.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 092a91fe40..5e2215c60a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -54,17 +54,17 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((activeChar == null) || (castle == null)) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != activeChar.getClanId())) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); return; } else if (!activeChar.isClanLeader()) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); return; } else if (!castle.getIsTimeRegistrationOver()) @@ -81,12 +81,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index 5ab9bf7732..220b673807 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -109,7 +109,7 @@ public final class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - _log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); + LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -117,7 +117,7 @@ public final class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - _log.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); + LOGGER.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -224,7 +224,7 @@ public final class Say2 implements IClientIncomingPacket } else { - _log.info("No handler registered for ChatType: " + _type + " Player: " + client); + LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -271,7 +271,7 @@ public final class Say2 implements IClientIncomingPacket if (item == null) { - _log.info(client + " trying publish item which doesnt own! ID:" + id); + LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -279,7 +279,7 @@ public final class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - _log.info(client + " sent invalid publish item msg! ID:" + id); + LOGGER.info(client + " sent invalid publish item msg! ID:" + id); return false; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 84eccf9f7a..2255ca3502 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -67,14 +67,14 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket activeChar.sendMessage("The command " + command.substring(6) + " does not exists!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 60c0402b18..237686ac3b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -128,7 +128,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -175,7 +175,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -187,7 +187,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 9c76eb1086..dc8836ed4b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -167,13 +167,13 @@ public final class SendWareHouseWithDrawList implements IClientIncomingPacket final L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final L2ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java index 5999d7d02c..8ae98bd315 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -272,7 +272,7 @@ public final class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(activeChar, item, _ctrlPressed)) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java index 1441d46716..622d6d2d7f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java @@ -64,8 +64,8 @@ public class ValidatePosition implements IClientIncomingPacket if (Config.DEVELOPER) { - _log.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); - _log.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); + LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); + LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); } if ((_x == 0) && (_y == 0)) @@ -191,7 +191,7 @@ public class ValidatePosition implements IClientIncomingPacket { if (Config.DEVELOPER) { - _log.info(activeChar.getName() + ": Synchronizing position Server --> Client"); + LOGGER.info(activeChar.getName() + ": Synchronizing position Server --> Client"); } activeChar.sendPacket(new ValidateLocation(activeChar)); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 75eb3d1455..b697ad27ec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -57,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - _log.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - _log.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((activeChar.getAbilityPoints() == 0) || (activeChar.getAbilityPoints() == activeChar.getAbilityPointsUsed())) { - _log.warning("Player " + activeChar + " is trying to learn ability without ability points!"); + LOGGER.warning("Player " + activeChar + " is trying to learn ability without ability points!"); return; } @@ -115,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final L2SkillLearn learn = SkillTreesData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - _log.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -123,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - _log.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - _log.warning("Player " + activeChar + " is trying to learn " + skill + " without enough ability points spent!"); + LOGGER.warning("Player " + activeChar + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (activeChar.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - _log.warning("Player " + activeChar + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + LOGGER.warning("Player " + activeChar + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((activeChar.getAbilityPoints() - activeChar.getAbilityPointsUsed()) < points) { - _log.warning("Player " + activeChar + " is trying to learn ability without ability points!"); + LOGGER.warning("Player " + activeChar + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 414e817ffe..fde25d4736 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -95,7 +95,7 @@ public class RequestAlchemyConversion implements IClientIncomingPacket final AlchemyCraftData data = AlchemyData.getInstance().getCraftData(_skillId, _skillLevel); if (data == null) { - _log.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 8cf9b2f3b5..8cf139d7c4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -57,7 +57,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_durationType < 0) || (_durationType > 3)) { - _log.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 659b237448..5e0ad65f1a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -101,7 +101,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning(activeChar + ": tried to crystallize " + item.getItem()); + LOGGER.warning(activeChar + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 076d40a420..a2d7c3bba4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -102,7 +102,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); } } else diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index faeca65fce..03435f7f4d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -101,7 +101,7 @@ public final class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not del friend objectid: ", e); + LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 29a252aa5e..94715a15c1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -94,7 +94,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index a7553a343f..5d89208157 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -61,7 +61,7 @@ public final class RequestBRProductList implements IClientIncomingPacket } default: { - _log.warning(player + " send unhandled product list type: " + _type); + LOGGER.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index 50b48de960..7c1b5ab107 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -71,7 +71,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { activeChar.sendMessage("That zone is not supported yet!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); return; } @@ -79,7 +79,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { activeChar.sendMessage("This zone is not handled yet!!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index 4c9c106a52..b6ac83ea82 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -60,7 +60,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket activeChar.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - _log.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); + LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java index eb24a578fb..9d28cd837c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java @@ -29,7 +29,7 @@ import com.l2jmobius.commons.network.BaseSendablePacket; */ public class BlowFishKey extends BaseSendablePacket { - private static Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param blowfishKey @@ -48,7 +48,7 @@ public class BlowFishKey extends BaseSendablePacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index d7f5a56cb6..4b509229e8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -75,7 +75,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - _log.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); _html = html.substring(0, 17200); } @@ -93,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - _log.warning("missing html page " + path); + LOGGER.warning("missing html page " + path); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 10466e04dc..77f3e3b00b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -134,7 +134,7 @@ public abstract class AbstractMessagePacket> // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - _log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 178e676132..31d4fbf45f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { - private static Logger _log = Logger.getLogger(CharSelectionInfo.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); private final String _loginName; private final int _sessionId; private int _activeId; @@ -240,7 +240,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } return new CharSelectInfoPackage[0]; } @@ -265,7 +265,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); } } @@ -377,7 +377,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 36ef7cd289..1c046a085c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -46,7 +46,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 03c64d3f83..a90b288eb1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -44,7 +44,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 0616962b58..6cedcdd459 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -55,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - _log.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + LOGGER.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_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 8b2fe9aa5e..ba2ae9f9f1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger _log = Logger.getLogger(IClientOutgoingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); int[] PAPERDOLL_ORDER = new int[] { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index f21611bb50..d0f43d0ffe 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -56,7 +56,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - _log.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 177c8c57a5..7c49d59505 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -56,7 +56,7 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD(_success ? 1 : 0); // item creation success/failed return true; } - _log.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); + LOGGER.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 44a9997fb2..562b2ccd31 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -78,7 +78,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - _log.warning("Null owner for castle: " + _castle.getName()); + LOGGER.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 1082f31974..77c787e1be 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -55,7 +55,7 @@ public final class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_activeChar.getActiveWarehouse() == null) { - _log.warning("error while sending withdraw request to: " + _activeChar.getName()); + LOGGER.warning("error while sending withdraw request to: " + _activeChar.getName()); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/DateRange.java index 3b8acae352..1a16f0bd49 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/DateRange.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; */ public class DateRange { - protected static final Logger _log = Logger.getLogger(DateRange.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(DateRange.class.getName()); private final Date _startDate, _endDate; public DateRange(Date from, Date to) @@ -47,7 +47,7 @@ public class DateRange } catch (ParseException e) { - _log.log(Level.WARNING, "Invalid Date Format.", e); + LOGGER.log(Level.WARNING, "Invalid Date Format.", e); } } return new DateRange(null, null); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/ScriptDocument.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/ScriptDocument.java index eacfe5baf8..672c90e094 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/ScriptDocument.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/ScriptDocument.java @@ -33,7 +33,7 @@ import org.xml.sax.SAXException; */ public class ScriptDocument { - private static final Logger _log = Logger.getLogger(ScriptDocument.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScriptDocument.class.getName()); private Document _document; private final String _name; @@ -57,17 +57,17 @@ public class ScriptDocument { x = sxe.getException(); } - _log.warning(getClass().getSimpleName() + ": " + x.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + x.getMessage()); } catch (ParserConfigurationException pce) { // Parser with specified options can't be built - _log.log(Level.WARNING, "", pce); + LOGGER.log(Level.WARNING, "", pce); } catch (IOException ioe) { // I/O error - _log.log(Level.WARNING, "", ioe); + LOGGER.log(Level.WARNING, "", ioe); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 1779779829..8344576a3e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SecondaryPasswordAuth { - private final Logger _log = Logger.getLogger(SecondaryPasswordAuth.class.getName()); + private final Logger LOGGER = Logger.getLogger(SecondaryPasswordAuth.class.getName()); private final L2GameClient _activeClient; private String _password; @@ -96,7 +96,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); } } @@ -104,7 +104,7 @@ public class SecondaryPasswordAuth { if (passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -127,7 +127,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing password.", e); + LOGGER.log(Level.SEVERE, "Error while writing password.", e); return false; } _password = password; @@ -147,7 +147,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing wrong attempts.", e); + LOGGER.log(Level.SEVERE, "Error while writing wrong attempts.", e); return false; } return true; @@ -157,7 +157,7 @@ public class SecondaryPasswordAuth { if (!passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -185,7 +185,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); return false; } @@ -210,7 +210,7 @@ public class SecondaryPasswordAuth { LoginServerThread.getInstance().sendTempBan(_activeClient.getAccountName(), _activeClient.getConnectionAddress().getHostAddress(), SecondaryAuthData.getInstance().getBanTime()); LoginServerThread.getInstance().sendMail(_activeClient.getAccountName(), "SATempBan", _activeClient.getConnectionAddress().getHostAddress(), Integer.toString(SecondaryAuthData.getInstance().getMaxAttempts()), Long.toString(SecondaryAuthData.getInstance().getBanTime()), SecondaryAuthData.getInstance().getRecoveryLink()); - _log.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); + LOGGER.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); insertWrongAttempt(0); _activeClient.close(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_BAN, SecondaryAuthData.getInstance().getMaxAttempts())); } @@ -258,11 +258,11 @@ public class SecondaryPasswordAuth } catch (NoSuchAlgorithmException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); } catch (UnsupportedEncodingException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Encoding"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Encoding"); } return null; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index 9f26c91ac6..49f8a70c08 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; */ public class AttackStanceTaskManager { - protected static final Logger _log = Logger.getLogger(AttackStanceTaskManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AttackStanceTaskManager.class.getName()); protected static final Map _attackStanceTasks = new ConcurrentHashMap<>(); @@ -132,7 +132,7 @@ public class AttackStanceTaskManager catch (Exception e) { // Unless caught here, players remain in attack positions. - _log.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Broadcast.java index 419eb6295a..dfaa95d5d0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Broadcast.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.RelationChanged; */ public final class Broadcast { - private static Logger _log = Logger.getLogger(Broadcast.class.getName()); + private static Logger LOGGER = Logger.getLogger(Broadcast.class.getName()); /** * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character that have the Character targeted.
@@ -101,7 +101,7 @@ public final class Broadcast } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } }); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Evolve.java index 7fae394d24..66a22f62fd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/Evolve.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class Evolve { - protected static final Logger _log = Logger.getLogger(Evolve.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Evolve.class.getName()); public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) { @@ -287,7 +287,7 @@ public final class Evolve } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } @@ -314,7 +314,7 @@ public final class Evolve } catch (Throwable e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java index f005fca2ea..7c4f9c2185 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -40,7 +40,7 @@ public final class FloodProtectorAction /** * Logger */ - private static final Logger _log = Logger.getLogger(FloodProtectorAction.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectorAction.class.getName()); /** * Client for this instance of flood protector. */ @@ -94,7 +94,7 @@ public final class FloodProtectorAction if ((curTick < _nextGameTick) || _punishmentInProgress) { - if (_config.LOG_FLOODING && !_logged && _log.isLoggable(Level.WARNING)) + if (_config.LOG_FLOODING && !_logged && LOGGER.isLoggable(Level.WARNING)) { log(" called command ", command, " ~", String.valueOf((_config.FLOOD_PROTECTION_INTERVAL - (_nextGameTick - curTick)) * GameTimeController.MILLIS_IN_TICK), " ms after previous command"); _logged = true; @@ -124,7 +124,7 @@ public final class FloodProtectorAction return false; } - if ((_count.get() > 0) && _config.LOG_FLOODING && _log.isLoggable(Level.WARNING)) + if ((_count.get() > 0) && _config.LOG_FLOODING && LOGGER.isLoggable(Level.WARNING)) { log(" issued ", String.valueOf(_count), " extra requests within ~", String.valueOf(_config.FLOOD_PROTECTION_INTERVAL * GameTimeController.MILLIS_IN_TICK), " ms"); } @@ -142,7 +142,7 @@ public final class FloodProtectorAction { Disconnection.of(_client).defaultSequence(false); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log("kicked for flooding"); } @@ -154,7 +154,7 @@ public final class FloodProtectorAction private void banAccount() { PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -176,7 +176,7 @@ public final class FloodProtectorAction PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" jailed for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -238,6 +238,6 @@ public final class FloodProtectorAction Arrays.stream(lines).forEach(output::append); - _log.warning(output.toString()); + LOGGER.warning(output.toString()); } } \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/GMAudit.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/GMAudit.java index c2ee25069b..c2a5593953 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/GMAudit.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/GMAudit.java @@ -31,7 +31,7 @@ import com.l2jmobius.Config; */ public class GMAudit { - private static final Logger _log = Logger.getLogger(GMAudit.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GMAudit.class.getName()); static { new File("log/GMAudit").mkdirs(); @@ -61,7 +61,7 @@ public class GMAudit } catch (IOException e) { - _log.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); + LOGGER.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 7394f489e8..ecc40e644b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public final class OfflineTradeUtil { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private OfflineTradeUtil() { @@ -145,7 +145,7 @@ public final class OfflineTradeUtil } Disconnection.of(player).storeMe().close(false); - LOG_ACCOUNTING.info("Entering offline mode, " + client); + LOGGER_ACCOUNTING.info("Entering offline mode, " + client); return true; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/FloodProtectedListener.java index df39b38769..d046a0f65c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import com.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger _log = Logger.getLogger(FloodProtectedListener.class.getName()); + private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map _floodProtection = new ConcurrentHashMap<>(); private ServerSocket _serverSocket; @@ -70,7 +70,7 @@ public abstract class FloodProtectedListener extends Thread fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) { - _log.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); + LOGGER.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); } fConnection.isFlooding = true; continue; @@ -78,7 +78,7 @@ public abstract class FloodProtectedListener extends Thread if (fConnection.isFlooding) // if connection was flooding server but now passed the check { fConnection.isFlooding = false; - _log.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); + LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } fConnection.lastConnection = System.currentTimeMillis(); } @@ -102,7 +102,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException io) { - _log.log(Level.INFO, "", io); + LOGGER.log(Level.INFO, "", io); } break; } @@ -145,7 +145,7 @@ public abstract class FloodProtectedListener extends Thread } else { - _log.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); + LOGGER.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); } } @@ -157,7 +157,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java index 767e0b2326..78eadc9019 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters; */ public class GameServerThread extends Thread { - protected static final Logger _log = Logger.getLogger(GameServerThread.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GameServerThread.class.getName()); private final Socket _connection; private InputStream _in; private OutputStream _out; @@ -69,7 +69,7 @@ public class GameServerThread extends Thread _connectionIPAddress = _connection.getInetAddress().getHostAddress(); if (GameServerThread.isBannedGameserverIP(_connectionIPAddress)) { - _log.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); + LOGGER.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); forceClose(LoginServerFail.REASON_IP_BANNED); // ensure no further processing for this connection return; @@ -92,7 +92,7 @@ public class GameServerThread extends Thread if ((lengthHi < 0) || _connection.isClosed()) { - _log.finer("LoginServerThread: Login terminated the connection."); + LOGGER.finer("LoginServerThread: Login terminated the connection."); break; } @@ -110,7 +110,7 @@ public class GameServerThread extends Thread if (receivedBytes != (length - 2)) { - _log.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); + LOGGER.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); break; } @@ -119,7 +119,7 @@ public class GameServerThread extends Thread checksumOk = NewCrypt.verifyChecksum(data); if (!checksumOk) { - _log.warning("Incorrect packet checksum, closing connection (LS)"); + LOGGER.warning("Incorrect packet checksum, closing connection (LS)"); return; } @@ -130,14 +130,14 @@ public class GameServerThread extends Thread { final String serverName = getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"; final String msg = "GameServer " + serverName + ": Connection lost: " + e.getMessage(); - _log.info(msg); + LOGGER.info(msg); } finally { if (isAuthed()) { _gsi.setDown(); - _log.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); + LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); @@ -185,7 +185,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); + LOGGER.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); } } @@ -209,7 +209,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final ScrambledKeyPair pair = LoginController.getInstance().getScrambledRSAKeyPair(); _privateKey = (RSAPrivateKey) pair.getPrivateKey(); @@ -241,7 +241,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.severe("IOException while sending packet " + sl.getClass().getSimpleName()); + LOGGER.severe("IOException while sending packet " + sl.getClass().getSimpleName()); } } @@ -265,7 +265,7 @@ public class GameServerThread extends Thread */ public void setGameHosts(String[] hosts) { - _log.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); + LOGGER.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); _gsi.clearServerAddresses(); for (int i = 0; i < hosts.length; i += 2) @@ -276,13 +276,13 @@ public class GameServerThread extends Thread } catch (Exception e) { - _log.warning("Couldn't resolve hostname \"" + e + "\""); + LOGGER.warning("Couldn't resolve hostname \"" + e + "\""); } } for (String s : _gsi.getServerAddresses()) { - _log.info(s); + LOGGER.info(s); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/L2LoginServer.java index bad76dd97c..b87afbb356 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/L2LoginServer.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; */ public final class L2LoginServer { - private final Logger _log = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; private static L2LoginServer _instance; @@ -77,7 +77,7 @@ public final class L2LoginServer } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Load Config @@ -92,7 +92,7 @@ public final class L2LoginServer } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); System.exit(1); } @@ -104,11 +104,11 @@ public final class L2LoginServer { _gameServerListener = new GameServerListener(); _gameServerListener.start(); - _log.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); + LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); } catch (IOException e) { - _log.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); System.exit(1); } @@ -148,7 +148,7 @@ public final class L2LoginServer } catch (NumberFormatException nfe) { - _log.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); return; } } @@ -159,25 +159,25 @@ public final class L2LoginServer } catch (UnknownHostException e) { - _log.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); } }); //@formatter:on } catch (IOException e) { - _log.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); } - _log.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); + LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); } else { - _log.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); + LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); } if (Config.LOGIN_SERVER_SCHEDULE_RESTART) { - _log.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); + LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); _restartLoginServer = new LoginServerRestart(); _restartLoginServer.setDaemon(true); _restartLoginServer.start(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/LoginController.java index ff547092da..a896c7fd7a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/LoginController.java @@ -51,7 +51,7 @@ import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason public class LoginController { - protected static final Logger _log = Logger.getLogger(LoginController.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(LoginController.class.getName()); private static LoginController _instance; @@ -78,7 +78,7 @@ public class LoginController private LoginController() throws GeneralSecurityException { - _log.info("Loading LoginController..."); + LOGGER.info("Loading LoginController..."); _keyPairs = new ScrambledKeyPair[10]; _blowfishKeyGenerator = KeyGenerator.getInstance("Blowfish"); @@ -91,7 +91,7 @@ public class LoginController _keyPairs[i] = new ScrambledKeyPair(rsaKeyPairGenerator.generateKeyPair()); } - _log.info("Cached 10 KeyPairs for RSA communication."); + LOGGER.info("Cached 10 KeyPairs for RSA communication."); final Thread purge = new PurgeThread(); purge.setDaemon(true); @@ -156,7 +156,7 @@ public class LoginController addBanForAddress(addr, Config.LOGIN_BLOCK_AFTER_BAN * 1000); // we need to clear the failed login attempts here, so after the ip ban is over the client has another 5 attempts clearFailedLoginAttemps(addr); - _log.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); + LOGGER.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); } } @@ -218,16 +218,16 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); return null; } - _log.info("Auto created account '" + login + "'."); + LOGGER.info("Auto created account '" + login + "'."); return retriveAccountInfo(addr, login, password, false); } catch (Exception e) { - _log.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); return null; } } @@ -301,7 +301,7 @@ public class LoginController if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); - _log.info("Removed expired ip address ban " + address.getHostAddress() + "."); + LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); return false; } return true; @@ -414,7 +414,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); } } return loginOk; @@ -433,7 +433,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); } } @@ -452,7 +452,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); } } @@ -532,13 +532,13 @@ public class LoginController { if (!ipWhiteList.isEmpty() && !ipWhiteList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); return false; } if (!ipBlackList.isEmpty() && ipBlackList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); return false; } } @@ -558,7 +558,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not finish login process!", e); + LOGGER.log(Level.WARNING, "Could not finish login process!", e); return false; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java index 83ad61827b..bfa7e9dc02 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class L2JGameServerPacketHandler { - protected static Logger _log = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); + protected static Logger LOGGER = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); public enum GameServerState { @@ -65,7 +65,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -83,7 +83,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -146,7 +146,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2LoginClient.java index c4f45ea59b..da20164f21 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -46,7 +46,7 @@ import io.netty.channel.ChannelHandlerContext; */ public final class L2LoginClient extends ChannelInboundHandler { - private static final Logger _log = Logger.getLogger(L2LoginClient.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2LoginClient.class.getName()); // Crypt private final ScrambledKeyPair _scrambledPair; @@ -105,7 +105,7 @@ public final class L2LoginClient extends ChannelInboundHandler } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java index 60d7ed1647..2172a0ef38 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java @@ -46,7 +46,7 @@ import com.l2jmobius.loginserver.network.serverpackets.ServerList; */ public class RequestAuthLogin implements IIncomingPacket { - private static Logger _log = Logger.getLogger(RequestAuthLogin.class.getName()); + private static Logger LOGGER = Logger.getLogger(RequestAuthLogin.class.getName()); private final byte[] _raw1 = new byte[128]; private final byte[] _raw2 = new byte[128]; @@ -89,7 +89,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (GeneralSecurityException e) { - _log.log(Level.INFO, "", e); + LOGGER.log(Level.INFO, "", e); return; } @@ -108,7 +108,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java index 6abfe18518..a68b2053a7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java @@ -32,7 +32,7 @@ import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerSt */ public class BlowFishKey extends BaseRecievePacket { - protected static final Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param decrypt @@ -67,7 +67,7 @@ public class BlowFishKey extends BaseRecievePacket } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java index 03ff8df8d3..4e0c492ffa 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java @@ -27,7 +27,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class ChangeAccessLevel extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangeAccessLevel.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangeAccessLevel.class.getName()); /** * @param decrypt @@ -40,6 +40,6 @@ public class ChangeAccessLevel extends BaseRecievePacket final String account = readS(); LoginController.getInstance().setAccountAccessLevel(account, level); - _log.info("Changed " + account + " access level to " + level); + LOGGER.info("Changed " + account + " access level to " + level); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java index d4c10be532..69ba99271d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java @@ -35,7 +35,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ChangePassword extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangePassword.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangePassword.class.getName()); private static GameServerThread gst = null; public ChangePassword(byte[] decrypt) @@ -103,7 +103,7 @@ public class ChangePassword extends BaseRecievePacket passUpdated = ps.executeUpdate(); } - _log.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); + LOGGER.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); if (passUpdated > 0) { gst.ChangePasswordResponse((byte) 1, characterName, "You have successfully changed your password!"); @@ -120,7 +120,7 @@ public class ChangePassword extends BaseRecievePacket } catch (Exception e) { - _log.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); + LOGGER.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java index 2154becbb5..153a4cd86d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class GameServerAuth extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(GameServerAuth.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GameServerAuth.class.getName()); GameServerThread _server; private final byte[] _hexId; private final int _desiredId; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java index 194d82d565..baa6528090 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerLogout extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerLogout.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerLogout.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java index 69c263628b..542848f6e6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class PlayerTracert extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerTracert.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerTracert.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java index 1a76467686..f9a24a80d8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java @@ -31,7 +31,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class RequestTempBan extends BaseRecievePacket { - private static final Logger _log = Logger.getLogger(RequestTempBan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RequestTempBan.class.getName()); private final String _accountName; @SuppressWarnings("unused") @@ -69,7 +69,7 @@ public class RequestTempBan extends BaseRecievePacket } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } try diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java index 6c7aed04d5..155d19688d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java @@ -28,7 +28,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ServerStatus extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ServerStatus.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ServerStatus.class.getName()); public static final int SERVER_LIST_STATUS = 0x01; public static final int SERVER_TYPE = 0x02; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java index acbbe42acf..5757078e73 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -61,7 +61,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; */ public final class ServerList implements IOutgoingPacket { - protected static final Logger _log = Logger.getLogger(ServerList.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ServerList.class.getName()); private final List _servers; private final int _lastServer; @@ -90,7 +90,7 @@ public final class ServerList implements IOutgoingPacket } catch (UnknownHostException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); _ip = new byte[4]; _ip[0] = 127; _ip[1] = 0; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java index 593e01a15d..887e4f715c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; */ public class IPv4Filter implements Runnable { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final HashMap _ipFloodMap; private static final long SLEEP_TIME = 5000; @@ -69,7 +69,7 @@ public class IPv4Filter implements Runnable final InetAddress addr = sc.socket().getInetAddress(); if (!(addr instanceof Inet4Address)) { - _log.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); + LOGGER.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/AbstractNpcAI.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/AbstractNpcAI.java index 12e345f842..5647db4178 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/AbstractNpcAI.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/AbstractNpcAI.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class AbstractNpcAI extends Quest { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); public AbstractNpcAI() { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java index 1f8241ae42..d475493c5c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java @@ -76,7 +76,7 @@ public final class CrumaTower extends AbstractNpcAI } catch (Exception e) { - _log.warning("Invalid location for Cruma Tower teleport device."); + LOGGER.warning("Invalid location for Cruma Tower teleport device."); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java index b21c9b9df7..a1916fbe26 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java @@ -119,7 +119,7 @@ public final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - _log.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); + LOGGER.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); return null; } final int skillId = getSkillIdByNpcId(npc.getId()); @@ -144,7 +144,7 @@ public final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - _log.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); + LOGGER.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); return null; } final int skillId = getSkillIdByNpcId(npc.getId()); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 23514e5981..e86278e0e3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -135,7 +135,7 @@ public final class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000L; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000L, cycle); - _log.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index c56b9cd6e2..47ca8563c0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -303,7 +303,7 @@ public final class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - _log.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } @@ -368,7 +368,7 @@ public final class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - _log.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); return null; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java index 7fd192d114..fa11615bfe 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java @@ -199,7 +199,7 @@ public class EnchantedMegaliths extends AbstractNpcAI private void updateMegalithStage() { GlobalVariablesManager.getInstance().set(HB_MEGALITH_STAGE, stage); - _log.info("[Hellbound] - Enchanted Megaliths stage: " + stage); + LOGGER.info("[Hellbound] - Enchanted Megaliths stage: " + stage); switch (stage) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index e67e5ea74d..78377b5546 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -57,6 +58,8 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets; */ public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName()); + // NPCs private static final int CONQUEROR_MANAGER = 31921; private static final int EMPEROR_MANAGER = 31922; @@ -678,7 +681,7 @@ public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReade { ROOM_SPAWN_DATA.clear(); parseDatapackFile("data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.xml"); - _log.info("[Four Sepulchers] Loaded " + ROOM_SPAWN_DATA.size() + " spawn zones data."); + LOGGER.info("[Four Sepulchers] Loaded " + ROOM_SPAWN_DATA.size() + " spawn zones data."); } @Override diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index d0e679a7d6..e428ba8107 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -319,7 +319,7 @@ public final class Raina extends AbstractNpcAI if (cType == null) { - _log.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); + LOGGER.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); } final StringBuilder sb = new StringBuilder(); @@ -404,7 +404,7 @@ public final class Raina extends AbstractNpcAI if (cType == null) { - _log.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); + LOGGER.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); } final StringBuilder sb = new StringBuilder(); @@ -894,7 +894,7 @@ public final class Raina extends AbstractNpcAI final String text = getHtm(player.getHtmlPrefix(), fileName); if (text == null) { - _log.info("Cannot find HTML file for " + Raina.class.getSimpleName() + " AI: " + fileName); + LOGGER.info("Cannot find HTML file for " + Raina.class.getSimpleName() + " AI: " + fileName); return null; } html.setHtml(text); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 1f39611ed2..bd2ea79b44 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -628,7 +628,7 @@ public final class Antharas extends AbstractNpcAI { if (!zone.isCharacterInZone(attacker) || (getStatus() != IN_FIGHT)) { - _log.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); attacker.teleToLocation(80464, 152294, -3534); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 33344e3f16..ef75b87d78 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -271,12 +271,12 @@ public class Lindvior extends AbstractNpcAI if (!_zoneLair.isInsideZone(attacker)) { attacker.doDie(null); - _log.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " out of the boss zone!"); + LOGGER.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " out of the boss zone!"); } if (!_zoneLair.isInsideZone(npc)) { npc.teleToLocation(CENTER_LOCATION, true); - _log.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " wich is out of the boss zone!"); + LOGGER.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " wich is out of the boss zone!"); } double percent = ((npc.getCurrentHp() - damage) / npc.getMaxHp()) * 100; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index fbe2297935..ff6ffbd3a9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -314,7 +314,7 @@ public final class Sailren extends AbstractNpcAI { if (STATUS == Status.IN_FIGHT) { - _log.info(getClass().getSimpleName() + ": Script is being unloaded while Sailren is active, clearing zone."); + LOGGER.info(getClass().getSimpleName() + ": Script is being unloaded while Sailren is active, clearing zone."); notifyEvent("TIME_OUT", null, null); } return super.unload(removeFromList); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index 41c7968623..202e22b1f3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -67,6 +68,8 @@ import instances.AbstractInstance; */ public final class Stage1 extends AbstractInstance implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(Stage1.class.getName()); + protected static class SODSpawn { public boolean isZone = false; @@ -207,7 +210,7 @@ public final class Stage1 extends AbstractInstance implements IGameXmlReader public void load() { parseDatapackFile("data/scripts/ai/bosses/Tiat/SeedOfDestruction.xml"); - _log.info("[Seed of Destruction] Loaded " + _spawnZoneList.size() + " spawn zones data."); + LOGGER.info("[Seed of Destruction] Loaded " + _spawnZoneList.size() + " spawn zones data."); } @Override @@ -346,7 +349,7 @@ public final class Stage1 extends AbstractInstance implements IGameXmlReader } else { - _log.info("[Seed of Destruction] Missing zone: " + spw.zone); + LOGGER.info("[Seed of Destruction] Missing zone: " + spw.zone); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java index 1fc5df6996..92ef8f9f25 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java @@ -150,7 +150,7 @@ public final class CastleAmbassador extends AbstractNpcAI if (fort == null) { npc.deleteMe(); - _log.warning("Spawned: " + npc + " location: " + npc.getLocation() + " without fort!"); + LOGGER.warning("Spawned: " + npc + " location: " + npc.getLocation() + " without fort!"); return null; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 45780446af..509ac8cb3d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1245,7 +1245,7 @@ public final class CastleChamberlain extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index 749f577141..e0f4f546e6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public final class ManorManager extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 9e65f90f3a..dc61f5b704 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -73,7 +73,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler "watchmatch", "arenachange" }; - private static final Logger _LOG = Logger.getLogger(OlyManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlyManager.class.getName()); private OlyManager() { @@ -364,7 +364,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler final List spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns(); if (spectatorSpawns.isEmpty()) { - _LOG.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); + LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); @@ -375,7 +375,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler } catch (Exception e) { - _LOG.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 4ca3d1df97..813358bd0c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -88,7 +88,7 @@ public final class Elpies extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started because custom NPC table is disabled!"); + LOGGER.info(getName() + ": Event can't be started because custom NPC table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index e8d253c2c9..bd418adefc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -95,7 +95,7 @@ public final class Rabbits extends Event // Check starting conditions if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPCs are disabled!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java index 19f2f42bae..7756d0d55e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java @@ -121,7 +121,7 @@ public final class Race extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom npc table is disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom npc table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/listeners/ListenerTest.java index 73b858e854..59dcb31683 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -63,7 +63,7 @@ public class ListenerTest extends AbstractNpcAI // Manual listener registration Containers.Global().addListener(new ConsumerEventListener(Containers.Global(), EventType.ON_PLAYER_DLG_ANSWER, (OnPlayerDlgAnswer event) -> { - _log.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); }, this)); } @@ -73,7 +73,7 @@ public class ListenerTest extends AbstractNpcAI */ private void onAttackableAttack(OnAttackableAttack event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); } /** @@ -88,7 +88,7 @@ public class ListenerTest extends AbstractNpcAI @Id(22228) private void onCreatureKill(OnCreatureDeath event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); } /** @@ -101,7 +101,7 @@ public class ListenerTest extends AbstractNpcAI @Range(from = 1, to = 9) private void onSiegeStart(OnCastleSiegeStart event) { - _log.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); + LOGGER.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); } /** @@ -114,7 +114,7 @@ public class ListenerTest extends AbstractNpcAI @Id(5575) private void onItemCreate(OnItemCreate event) { - _log.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); + LOGGER.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); } /** @@ -152,7 +152,7 @@ public class ListenerTest extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void OnPlayerLogin(OnPlayerLogin event) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); } /** @@ -170,7 +170,7 @@ public class ListenerTest extends AbstractNpcAI { if (event.getTarget().isGM()) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); return new TerminateReturn(true, true, true); } return null; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java index 61c0dbf57b..4736bff5de 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java @@ -340,7 +340,7 @@ import handlers.voicedcommandhandlers.StatsVCmd; */ public class MasterHandler { - private static final Logger _log = Logger.getLogger(MasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MasterHandler.class.getName()); private static final IHandler[] LOAD_INSTANCES = { @@ -678,7 +678,7 @@ public class MasterHandler public static void main(String[] args) { - _log.info("Loading Handlers..."); + LOGGER.info("Loading Handlers..."); final Map, Method> registerHandlerMethods = new HashMap<>(); for (IHandler loadInstance : LOAD_INSTANCES) @@ -695,7 +695,7 @@ public class MasterHandler registerHandlerMethods.entrySet().stream().filter(e -> e.getValue() == null).forEach(e -> { - _log.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); + LOGGER.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); }); for (Class classes[] : HANDLERS) @@ -720,7 +720,7 @@ public class MasterHandler } catch (Exception e) { - _log.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); + LOGGER.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); continue; } } @@ -757,9 +757,9 @@ public class MasterHandler for (IHandler loadInstance : LOAD_INSTANCES) { - _log.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); + LOGGER.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); } - _log.info("Handlers Loaded..."); + LOGGER.info("Handlers Loaded..."); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java index 2c0368fa04..6239aa2af9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java @@ -34,7 +34,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target; if (staticObject.getType() < 0) { - _log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); + LOGGER.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); } // Check if the L2PcInstance already target the L2NpcInstance diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7b78de63fe..1ead5e9548 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminAdmin implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminAdmin.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminAdmin.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -121,7 +121,7 @@ public class AdminAdmin implements IAdminCommandHandler } catch (Exception e) { - _log.warning("An error occured while ending olympiad: " + e); + LOGGER.warning("An error occured while ending olympiad: " + e); } activeChar.sendMessage("Heroes formed."); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c517e187f2..ae58296f38 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.UserInfo; */ public class AdminEditChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEditChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEditChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -218,7 +218,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set reputation error: " + e); + LOGGER.warning("Set reputation error: " + e); } activeChar.sendMessage("Usage: //setreputation "); } @@ -261,7 +261,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pk error: " + e); + LOGGER.warning("Set pk error: " + e); } activeChar.sendMessage("Usage: //setpk "); } @@ -291,7 +291,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pvp error: " + e); + LOGGER.warning("Set pvp error: " + e); } activeChar.sendMessage("Usage: //setpvp "); } @@ -321,7 +321,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set Fame error: " + e); + LOGGER.warning("Set Fame error: " + e); } activeChar.sendMessage("Usage: //setfame "); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 1634710c12..2de1bf7bd5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; */ public class AdminEnchant implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEnchant.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEnchant.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -146,7 +146,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a new enchant value."); } @@ -154,7 +154,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a valid new enchant value."); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index 5acf20c5b6..1da9a18c9d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminHeal implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_heal" @@ -57,7 +57,7 @@ public class AdminHeal implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Heal error: " + e); + LOGGER.warning("Heal error: " + e); } activeChar.sendMessage("Incorrect target/radius specified."); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index 549035d177..5ab19d4b39 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminMenu implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminMenu.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminMenu.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -112,7 +112,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_recall_clan_menu")) @@ -141,7 +141,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_goto_char_menu")) @@ -190,7 +190,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -207,7 +207,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5b95022983..cd89f2cc84 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminPunishment implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPunishment.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPunishment.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -86,7 +86,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); } } else @@ -149,7 +149,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); } break; } @@ -186,7 +186,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); } break; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java index 934e877d84..764ab77c25 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminRepairChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRepairChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRepairChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -101,7 +101,7 @@ public class AdminRepairChar implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "could not repair char:", e); + LOGGER.log(Level.WARNING, "could not repair char:", e); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java index dfd8ab322b..52c768b06a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList; */ public class AdminShop implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShop.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShop.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -106,7 +106,7 @@ public class AdminShop implements IAdminCommandHandler } catch (Exception e) { - _log.warning("admin buylist failed:" + command); + LOGGER.warning("admin buylist failed:" + command); } final ProductList buyList = BuyListData.getInstance().getBuyList(val); @@ -117,7 +117,7 @@ public class AdminShop implements IAdminCommandHandler } else { - _log.warning("no buylist with id:" + val); + LOGGER.warning("no buylist with id:" + val); activeChar.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index a569d1fca6..780c3b0088 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.QuestList; */ public class AdminShowQuests implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShowQuests.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShowQuests.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -313,7 +313,7 @@ public class AdminShowQuests implements IAdminCommandHandler catch (Exception e) { actor.sendMessage("There was an error."); - _log.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java index ea51fdd106..93293c80e2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class AdminSkill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminSkill.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -526,7 +526,7 @@ public class AdminSkill implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } if (skill != null) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java index bf52975d48..603c953427 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class AdminSpawn implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSpawn.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -377,17 +377,17 @@ public class AdminSpawn implements IAdminCommandHandler default: case 0: { - _log.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); + LOGGER.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); break; } case 1: { - _log.info(""); + LOGGER.info(""); break; } case 2: { - _log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); + LOGGER.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); break; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java index 880aba40c1..a818e7f3d3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminSummon implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSummon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName()); public static final String[] ADMIN_COMMANDS = { @@ -69,7 +69,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -81,7 +81,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index a088b5f7f0..27bcfe9dd8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -50,7 +50,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminTeleport implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminTeleport.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminTeleport.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -525,7 +525,7 @@ public class AdminTeleport implements IAdminCommandHandler if (template1 == null) { activeChar.sendMessage("Incorrect monster template."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); return; } @@ -533,7 +533,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect monster spawn."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); return; } final int respawnTime = spawn.getRespawnDelay() / 1000; @@ -575,7 +575,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect raid spawn."); - _log.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); return; } DBSpawnManager.getInstance().deleteSpawn(spawn, true); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java index a02258ac82..6661cf897c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminUnblockIp implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminUnblockIp.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminUnblockIp.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -68,7 +68,7 @@ public class AdminUnblockIp implements IAdminCommandHandler private boolean unblockIp(String ipAddress, L2PcInstance activeChar) { // LoginServerThread.getInstance().unBlockip(ipAddress); - _log.warning("IP removed by GM " + activeChar.getName()); + LOGGER.warning("IP removed by GM " + activeChar.getName()); return true; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index d5baa52a73..fd68914b26 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -64,7 +64,7 @@ import ai.AbstractNpcAI; */ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPathNode.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPathNode.class.getName()); private final Map _zones = new ConcurrentHashMap<>(); private static final String[] COMMANDS = @@ -484,7 +484,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler catch (Exception e) { activeChar.sendMessage("Failed writing the dump: " + e.getMessage()); - _log.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Augment.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Augment.java index 6f3cdd671a..015cb20ce8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Augment.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Augment.java @@ -57,7 +57,7 @@ public class Augment implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Buy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Buy.java index dedd804298..5084dc1239 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Buy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Buy.java @@ -54,7 +54,7 @@ public class Buy implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 77244e8a99..b937970ce0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -112,7 +112,7 @@ public class ClanWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } } return false; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 383b2ac65a..648a840357 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -54,7 +54,7 @@ public class EventEngine implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 5bb42fb02d..2cc2c9cd2e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -121,7 +121,7 @@ public class ItemAuctionLink implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 1ee7660160..fc06d1b5ea 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -35,13 +35,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty link html!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - _log.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java index 15c9a87b30..bd019c6c2b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java @@ -59,7 +59,7 @@ public class Multisell implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 27bbae841c..8d2b77c311 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -62,7 +62,7 @@ public class NpcViewMod implements IBypassHandler if (!st.hasMoreTokens()) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -101,7 +101,7 @@ public class NpcViewMod implements IBypassHandler { if (st.countTokens() < 2) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -124,7 +124,7 @@ public class NpcViewMod implements IBypassHandler } catch (IllegalArgumentException e) { - _log.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); + LOGGER.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); return false; } break; @@ -571,7 +571,7 @@ public class NpcViewMod implements IBypassHandler String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/DropList.htm"); if (html == null) { - _log.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); + LOGGER.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); return; } html = html.replaceAll("%name%", npc.getName()); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 5ec5c94594..2f52504410 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -113,7 +113,7 @@ public class Observation implements IBypassHandler } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java index 6c16720329..0597ff6ab7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java @@ -66,7 +66,7 @@ public class PlayerHelp implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index d6c31d5495..59491ae669 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -67,7 +67,7 @@ public class PrivateWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 40de431ce5..fd1fe934bd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -63,7 +63,7 @@ public class Wear implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } @@ -73,7 +73,7 @@ public class Wear implements IBypassHandler final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index faa4b3ef97..d74fd3a648 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -39,7 +39,7 @@ public final class AttackTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": this effect must have parameters!"); + LOGGER.warning(getClass().getSimpleName() + ": this effect must have parameters!"); return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 675e1023d2..3b0c1fb514 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -74,7 +74,7 @@ public final class CallSkill extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 924b08d8f7..b582a0e29e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -66,7 +66,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } return skill.isToggle(); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 36bed01887..9b3af7d06a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -39,7 +39,7 @@ public final class DefenceTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); return; } @@ -57,11 +57,11 @@ public final class DefenceTrait extends AbstractEffect } catch (NumberFormatException e) { - _log.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); + LOGGER.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); + LOGGER.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index b6d50cd89c..8fb26ea974 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -48,7 +48,7 @@ public final class Disarmor extends AbstractEffect _slot = ItemTable.SLOTS.getOrDefault(slot, L2Item.SLOT_NONE); if (_slot == L2Item.SLOT_NONE) { - _log.severe("Unknown bodypart slot for effect: " + slot); + LOGGER.severe("Unknown bodypart slot for effect: " + slot); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index adf474fe77..dbc72f8b13 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -59,7 +59,7 @@ public final class Restoration extends AbstractEffect if ((_itemId <= 0) || (_itemCount <= 0)) { effected.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE); - _log.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); + LOGGER.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java index f9a102f869..edcd13b407 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -97,7 +97,7 @@ public final class Summon extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 0fab6deaee..c73eb71458 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -38,7 +38,7 @@ public final class SummonAgathion extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); } _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7ad2935324..d745528a40 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -64,7 +64,7 @@ public final class SummonCubic extends AbstractEffect if (_cubicId < 0) { - _log.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index b10d5cb341..d88f72ee89 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -66,7 +66,7 @@ public class SummonHallucination extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -79,7 +79,7 @@ public class SummonHallucination extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 03d7f27857..15c94c90a2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -87,7 +87,7 @@ public final class SummonMulti extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index ae4549f39f..5779663ae6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -80,7 +80,7 @@ public final class SummonNpc extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -93,7 +93,7 @@ public final class SummonNpc extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } @@ -162,7 +162,7 @@ public final class SummonNpc extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); + LOGGER.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5d8b92393c..a771a8e4cc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -75,14 +75,14 @@ public final class SummonPet extends AbstractEffect final PetItemHolder holder = player.removeScript(PetItemHolder.class); if (holder == null) { - _log.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); + LOGGER.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); return; } final L2ItemInstance collar = holder.getItem(); if (player.getInventory().getItemByObjectId(collar.getObjectId()) != collar) { - _log.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); + LOGGER.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 4528a3f91b..984c53a5ab 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -57,7 +57,7 @@ public final class SummonTrap extends AbstractEffect if (_npcId <= 0) { - _log.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); return; } @@ -76,7 +76,7 @@ public final class SummonTrap extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index c3a9b08bde..8d18d6fecc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -110,7 +110,7 @@ public final class Synergy extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 32ac16aa59..da879def26 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -146,7 +146,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index c9ce6cc000..b7d80e1e34 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -64,7 +64,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -81,7 +81,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 351e687f0f..2ce0c6758c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -88,7 +88,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c950983e3d..1c010ed094 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -91,7 +91,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 7a474f5b8d..956ef40eed 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -102,7 +102,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index fefd166e0d..014142ca85 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -114,7 +114,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 23a72039a7..1f0c32d50d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -97,7 +97,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -124,7 +124,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ca7c1239ec..c34321b251 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -90,7 +90,7 @@ public class BeastSoulShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index d631936c0d..8a39d5177d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -92,7 +92,7 @@ public class BeastSpiritShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index a053b95a9d..e3b723050d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -52,7 +52,7 @@ public class BlessedSoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9800a7e664..52f772757a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -48,7 +48,7 @@ public class BlessedSpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index e7c5629cc7..e1df0bdc7a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -59,7 +59,7 @@ public class EventItem implements IItemHandler } default: { - _log.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); + LOGGER.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); } } return used; @@ -103,7 +103,7 @@ public class EventItem implements IItemHandler }); return true; } - _log.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); + LOGGER.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); return false; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 16a703c486..66eb8ce01c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -54,7 +54,7 @@ public class ExtractableItems implements IItemHandler final List exitems = etcitem.getExtractableItems(); if (exitems == null) { - _log.info("No extractable data defined for " + etcitem); + LOGGER.info("No extractable data defined for " + etcitem); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 5c5598ea69..ac21e53795 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -84,7 +84,7 @@ public class FishShots implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 4773bde656..59fe8bc737 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -51,7 +51,7 @@ public final class Harvester implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 6685ef0b0d..3352b32a09 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -61,7 +61,7 @@ public class ItemSkillsTemplate implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.info("Item " + item + " does not have registered any skill for handler."); + LOGGER.info("Item " + item + " does not have registered any skill for handler."); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 05c1ac3f7d..d3ffb95e30 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -49,7 +49,7 @@ public class SoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index ddf0402d2b..87f06565c2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -48,7 +48,7 @@ public class SpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java index 7144892fa5..59ecba44bb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ClanWarsList implements IUserCommandHandler { - private static final Logger _log = Logger.getLogger(ClanWarsList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanWarsList.class.getName()); private static final int[] COMMAND_IDS = { 88, @@ -119,7 +119,7 @@ public class ClanWarsList implements IUserCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } return true; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java index 7dced5f20e..5e98fa04f5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - _log.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); return; } @@ -133,7 +133,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // When nobody can enter if (enterGroup == null) { - _log.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); + LOGGER.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); return; } @@ -214,7 +214,7 @@ public abstract class AbstractInstance extends AbstractNpcAI } else { - _log.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); + LOGGER.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 87fe82da43..1a091c8e32 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -430,7 +430,7 @@ public final class ChamberOfDelusion extends AbstractInstance } catch (Exception e) { - _log.log(Level.WARNING, "Error occured in room change task: ", e); + LOGGER.log(Level.WARNING, "Error occured in room change task: ", e); } }, nextInterval - 5000); world.setParameter("roomChangeTask", roomChangeTask); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 8d437b8318..38eb8cc483 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -655,7 +655,7 @@ public final class Kamaloka extends AbstractInstance } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } return null; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java index c96029eb3e..8fc543646f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java @@ -274,7 +274,7 @@ public final class Q10814_BefittingOfTheStatus extends Quest final String text = getHtm(player.getHtmlPrefix(), fileName); if (text == null) { - _log.info("Cannot find HTML file for " + Q10814_BefittingOfTheStatus.class.getSimpleName() + " Quest: " + fileName); + LOGGER.info("Cannot find HTML file for " + Q10814_BefittingOfTheStatus.class.getSimpleName() + " Quest: " + fileName); return null; } html.setHtml(text); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/QuestMasterHandler.java index f304e18a59..63ff0b4906 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/QuestMasterHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/QuestMasterHandler.java @@ -487,7 +487,7 @@ import quests.Q10843_AnomalyInTheEnchantedValley.Q10843_AnomalyInTheEnchantedVal */ public class QuestMasterHandler { - private static final Logger _log = Logger.getLogger(QuestMasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(QuestMasterHandler.class.getName()); private static final Class[] QUESTS = { @@ -965,7 +965,7 @@ public class QuestMasterHandler } catch (Exception e) { - _log.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); + LOGGER.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java index bcd888210f..623b41de9f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java @@ -74,7 +74,7 @@ public abstract class AirShipController extends AbstractNpcAI } } - public static final Logger _log = Logger.getLogger(AirShipController.class.getName()); + public static final Logger LOGGER = Logger.getLogger(AirShipController.class.getName()); protected int _dockZone = 0; protected int _shipSpawnX = 0; protected int _shipSpawnY = 0; @@ -334,7 +334,7 @@ public abstract class AirShipController extends AbstractNpcAI final L2ScriptZone zone = ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class); if (zone == null) { - _log.warning(getName() + ": Invalid zone " + _dockZone + ", controller disabled"); + LOGGER.warning(getName() + ": Invalid zone " + _dockZone + ", controller disabled"); _isBusy = true; return; } @@ -344,7 +344,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (_arrivalPath.length == 0) { - _log.warning(getName() + ": Zero arrival path length."); + LOGGER.warning(getName() + ": Zero arrival path length."); _arrivalPath = null; } else @@ -352,7 +352,7 @@ public abstract class AirShipController extends AbstractNpcAI p = _arrivalPath[_arrivalPath.length - 1]; if (!zone.isInsideZone(p.getLocation())) { - _log.warning(getName() + ": Arrival path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") not in zone " + _dockZone); + LOGGER.warning(getName() + ": Arrival path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") not in zone " + _dockZone); _arrivalPath = null; } } @@ -361,7 +361,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (!ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class).isInsideZone(_shipSpawnX, _shipSpawnY, _shipSpawnZ)) { - _log.warning(getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled"); + LOGGER.warning(getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled"); _isBusy = true; return; } @@ -371,7 +371,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (_departPath.length == 0) { - _log.warning(getName() + ": Zero depart path length."); + LOGGER.warning(getName() + ": Zero depart path length."); _departPath = null; } else @@ -379,7 +379,7 @@ public abstract class AirShipController extends AbstractNpcAI p = _departPath[_departPath.length - 1]; if (zone.isInsideZone(p.getLocation())) { - _log.warning(getName() + ": Departure path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") in zone " + _dockZone); + LOGGER.warning(getName() + ": Departure path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") in zone " + _dockZone); _departPath = null; } } @@ -389,11 +389,11 @@ public abstract class AirShipController extends AbstractNpcAI { if (_fuelTable == null) { - _log.warning(getName() + ": Fuel consumption not defined."); + LOGGER.warning(getName() + ": Fuel consumption not defined."); } else if (_teleportsTable.length != _fuelTable.length) { - _log.warning(getName() + ": Fuel consumption not match teleport list."); + LOGGER.warning(getName() + ": Fuel consumption not match teleport list."); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatGludinRune.java index c162606bf1..7edfc605df 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatGludinRune implements Runnable { - private static final Logger _log = Logger.getLogger(BoatGludinRune.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatGludinRune.class.getName()); // Time: 1151s private static final VehiclePathPoint[] GLUDIN_TO_RUNE = @@ -343,7 +343,7 @@ public class BoatGludinRune implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index 1805617eaf..fea42bcaa9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatInnadrilTour implements Runnable { - private static final Logger _log = Logger.getLogger(BoatInnadrilTour.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatInnadrilTour.class.getName()); // Time: 1867s private static final VehiclePathPoint[] TOUR = @@ -186,7 +186,7 @@ public class BoatInnadrilTour implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index c04177df76..1e62f23d02 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatRunePrimeval implements Runnable { - private static final Logger _log = Logger.getLogger(BoatRunePrimeval.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatRunePrimeval.class.getName()); // Time: 239s private static final VehiclePathPoint[] RUNE_TO_PRIMEVAL = @@ -168,7 +168,7 @@ public class BoatRunePrimeval implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseRecievePacket.java index b8e2b08f14..33146d6d53 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseRecievePacket.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public abstract class BaseRecievePacket { - private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseRecievePacket.class.getName()); private final byte[] _decrypt; private int _off; @@ -78,7 +78,7 @@ public abstract class BaseRecievePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } return result; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseSendablePacket.java index 894ea357b0..c29adc3bce 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseSendablePacket.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; */ public abstract class BaseSendablePacket { - private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseSendablePacket.class.getName()); private final ByteArrayOutputStream _bao; @@ -78,7 +78,7 @@ public abstract class BaseSendablePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } _bao.write(0); @@ -93,7 +93,7 @@ public abstract class BaseSendablePacket } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java index a2f78c7c94..a11ea8c3b5 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; public class ScrambledKeyPair { - private static Logger _log = Logger.getLogger(ScrambledKeyPair.class.getName()); + private static Logger LOGGER = Logger.getLogger(ScrambledKeyPair.class.getName()); public KeyPair _pair; public byte[] _scrambledModulus; @@ -66,7 +66,7 @@ public class ScrambledKeyPair { scrambledMod[0x40 + i] = (byte) (scrambledMod[0x40 + i] ^ scrambledMod[i]); } - _log.finer("Modulus was scrambled"); + LOGGER.finer("Modulus was scrambled"); return scrambledMod; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java index a4df772cc3..57a47cf456 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class ForumsBBSManager extends BaseBBSManager { - private static Logger _log = Logger.getLogger(ForumsBBSManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(ForumsBBSManager.class.getName()); private final List _table; private int _lastid = 1; @@ -51,7 +51,7 @@ public class ForumsBBSManager extends BaseBBSManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); } } @@ -61,7 +61,7 @@ public class ForumsBBSManager extends BaseBBSManager public void initRoot() { _table.forEach(f -> f.vload()); - _log.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); } /** diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java index 609f0858d5..4aa8b72edb 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class CharNameTable { - private static Logger _log = Logger.getLogger(CharNameTable.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharNameTable.class.getName()); private final Map _chars = new ConcurrentHashMap<>(); private final Map _accessLevels = new ConcurrentHashMap<>(); @@ -114,7 +114,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); } if (id > 0) @@ -162,7 +162,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return null; // not found @@ -190,7 +190,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); } return result; } @@ -211,7 +211,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); } return 0; } @@ -232,7 +232,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -253,7 +253,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); } return 0; } @@ -274,7 +274,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -294,9 +294,9 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); } public static CharNameTable getInstance() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/DocumentBase.java index 37410b0b38..fde34c2bc6 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/DocumentBase.java @@ -148,7 +148,7 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public abstract class DocumentBase { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final File _file; protected final Map _tables = new HashMap<>(); @@ -171,7 +171,7 @@ public abstract class DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Error loading file " + _file, e); + LOGGER.log(Level.SEVERE, "Error loading file " + _file, e); } return doc; } @@ -344,7 +344,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -361,7 +361,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -375,7 +375,7 @@ public abstract class DocumentBase return new ConditionLogicNot(parseCondition(n, template)); } } - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); return null; } @@ -900,7 +900,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1095,7 +1095,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1135,7 +1135,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); + LOGGER.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); } } cond = joinAnd(cond, new ConditionUsingItemType(mask)); @@ -1156,7 +1156,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); + LOGGER.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); } } cond = joinAnd(cond, new ConditionUsingSlotType(mask)); @@ -1192,7 +1192,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1222,7 +1222,7 @@ public abstract class DocumentBase } if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java index 4d3be938c9..c425e3360c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.LinkedList; import java.util.List; import java.util.logging.Level; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -43,6 +44,8 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public final class DocumentItem extends DocumentBase implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(DocumentItem.class.getName()); + private Item _currentItem = null; private final List _itemsInFile = new LinkedList<>(); @@ -92,7 +95,7 @@ public final class DocumentItem extends DocumentBase implements IGameXmlReader } catch (Exception e) { - _log.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); + LOGGER.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 6832094027..5343f17e51 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.util.MathUtil; */ public class GeoEngine { - protected static final Logger _log = Logger.getLogger(GeoEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GeoEngine.class.getName()); private final ABlock[][] _blocks; private final BlockNull _nullBlock; @@ -71,7 +71,7 @@ public class GeoEngine */ public GeoEngine() { - _log.info("GeoEngine: Initializing..."); + LOGGER.info("GeoEngine: Initializing..."); // initialize block container _blocks = new ABlock[GeoStructure.GEO_BLOCKS_X][GeoStructure.GEO_BLOCKS_Y]; @@ -105,7 +105,7 @@ public class GeoEngine } } - _log.info("GeoEngine: Loaded " + loaded + " geodata files."); + LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files."); // avoid wrong configs when no files are loaded if (loaded == 0) @@ -113,12 +113,12 @@ public class GeoEngine if (Config.PATHFINDING) { Config.PATHFINDING = false; - _log.info("GeoEngine: Forcing PathFinding setting to false."); + LOGGER.info("GeoEngine: Forcing PathFinding setting to false."); } if (Config.COORD_SYNCHRONIZE == 2) { Config.COORD_SYNCHRONIZE = -1; - _log.info("GeoEngine: Forcing CoordSynchronize setting to -1."); + LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); } } @@ -185,7 +185,7 @@ public class GeoEngine // check data consistency if (buffer.remaining() > 0) { - _log.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); + LOGGER.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); } // loading was successful @@ -194,8 +194,8 @@ public class GeoEngine catch (Exception e) { // an error occured while loading, load null blocks - _log.warning("GeoEngine: Error while loading " + filename + " region file."); - _log.warning(e.getMessage()); + LOGGER.warning("GeoEngine: Error while loading " + filename + " region file."); + LOGGER.warning(e.getMessage()); e.printStackTrace(); // replace whole region file with null blocks @@ -300,7 +300,7 @@ public class GeoEngine if (block == null) // null block check { // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) - // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // LOGGER.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java index ece8351c5e..b33b0292ac 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java @@ -57,11 +57,11 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); + LOGGER.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); } } - _log.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); + LOGGER.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); } @Override @@ -109,7 +109,7 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); return null; } finally diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IActionHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IActionHandler.java index c4addd7df5..3640b57f65 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IActionHandler.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IActionHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionHandler { - Logger _log = Logger.getLogger(IActionHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java index 35c546715c..5c5b946828 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionShiftHandler { - Logger _log = Logger.getLogger(IActionShiftHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionShiftHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IBypassHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IBypassHandler.java index a5a6295386..626cdb2b17 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IBypassHandler.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IBypassHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public interface IBypassHandler { - Logger _log = Logger.getLogger(IBypassHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IBypassHandler.class.getName()); /** * This is the worker method that is called when someone uses an bypass command. diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IItemHandler.java index 2f3d043ad0..a2079cc4ec 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IItemHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public interface IItemHandler { - Logger _log = Logger.getLogger(IItemHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IItemHandler.class.getName()); /** * Launch task associated to the item. diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java index 4030ad83de..0f9c7b0132 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentType; */ public interface IPunishmentHandler { - Logger _log = Logger.getLogger(IPunishmentHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IPunishmentHandler.class.getName()); void onStart(PunishmentTask task); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java index 72b8a7b21a..d1cb086c89 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IUserCommandHandler { - Logger _log = Logger.getLogger(IUserCommandHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IUserCommandHandler.class.getName()); /** * this is the worker method that is called when someone uses an admin command. diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java index e16e1eb679..9712fd7b04 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -60,7 +60,7 @@ import com.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi */ public final class CommissionManager { - private static final Logger _log = Logger.getLogger(CommissionManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CommissionManager.class.getName()); private static final int INTERACTION_DISTANCE = 250; private static final int ITEMS_LIMIT_PER_REQUEST = 999; @@ -103,7 +103,7 @@ public final class CommissionManager final L2ItemInstance itemInstance = itemInstances.get(rs.getInt("item_object_id")); if (itemInstance == null) { - _log.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); + LOGGER.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); continue; } final CommissionItem commissionItem = new CommissionItem(commissionId, itemInstance, rs.getLong("price_per_unit"), rs.getTimestamp("start_time").toInstant(), rs.getByte("duration_in_days")); @@ -121,7 +121,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); } } @@ -270,7 +270,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); player.sendPacket(SystemMessageId.THE_ITEM_HAS_FAILED_TO_BE_REGISTERED); player.sendPacket(ExResponseCommissionRegister.FAILED); } @@ -409,7 +409,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); } return false; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java index 7f4c6abd61..f635c19883 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class FactionManager { - private static Logger _log = Logger.getLogger(FactionManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(FactionManager.class.getName()); private final Map _playerFactions = new ConcurrentHashMap<>(); protected FactionManager() @@ -57,9 +57,9 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); } public final int getFactionByCharId(int id) @@ -91,7 +91,7 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return 0; // not found diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index b0fdfdf390..dc63278e16 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.entity.Fort; public final class FortManager implements InstanceListManager { - protected static final Logger _log = Logger.getLogger(FortManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); private final Map _forts = new ConcurrentSkipListMap<>(); @@ -131,7 +131,7 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - _log.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); for (Fort fort : getForts()) { fort.getSiege().loadSiegeGuard(); @@ -139,7 +139,7 @@ public final class FortManager implements InstanceListManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index aa7e2d3153..0a5245dafc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class FortSiegeManager { - private static final Logger _log = Logger.getLogger(FortSiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FortSiegeManager.class.getName()); private int _attackerMaxClans = 500; // Max number of clans @@ -101,7 +101,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -122,7 +122,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); + LOGGER.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); } // Siege setting @@ -163,7 +163,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading commander(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading commander(s) for " + fort.getName() + " fort."); } } @@ -189,7 +189,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading flag(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading flag(s) for " + fort.getName() + " fort."); } } _flagList.put(fort.getResidenceId(), _flagSpawns); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index 14f412ec48..338620a64f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; public final class GraciaSeedsManager { - private static final Logger _log = Logger.getLogger(GraciaSeedsManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GraciaSeedsManager.class.getName()); public static String ENERGY_SEEDS = "EnergySeeds"; @@ -70,7 +70,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); + LOGGER.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); break; } } @@ -124,7 +124,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); + LOGGER.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); } } } @@ -134,7 +134,7 @@ public final class GraciaSeedsManager final Quest quest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (quest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -155,7 +155,7 @@ public final class GraciaSeedsManager final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (esQuest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -171,7 +171,7 @@ public final class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { - _log.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); + LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 9c43355936..0a62e46364 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -47,7 +47,7 @@ public final class GrandBossManager implements IStorable private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?"; private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?"; - protected static Logger _log = Logger.getLogger(GrandBossManager.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GrandBossManager.class.getName()); protected static Map _bosses = new ConcurrentHashMap<>(); @@ -83,26 +83,26 @@ public final class GrandBossManager implements IStorable final int status = rs.getInt("status"); _bossStatus.put(bossId, status); _storedInfo.put(bossId, info); - _log.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); + LOGGER.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); if (status > 0) { - _log.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); + LOGGER.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); } } else { - _log.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); + LOGGER.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); } } - _log.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); } ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000); } @@ -115,7 +115,7 @@ public final class GrandBossManager implements IStorable public void setBossStatus(int bossId, int status) { _bossStatus.put(bossId, status); - _log.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); + LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); updateDb(bossId, true); } @@ -194,7 +194,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); return false; } return true; @@ -242,7 +242,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index e8b430a5df..c7290b6912 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public final class ItemsOnGroundManager implements Runnable { - private static final Logger _log = Logger.getLogger(ItemsOnGroundManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemsOnGroundManager.class.getName()); private final Set _items = ConcurrentHashMap.newKeySet(); @@ -88,7 +88,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); } } @@ -137,11 +137,11 @@ public final class ItemsOnGroundManager implements Runnable } } } - _log.info(getClass().getSimpleName() + ": Loaded " + count + " items."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + count + " items."); } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); } if (Config.EMPTY_DROPPED_ITEM_TABLE_AFTER_LOAD) @@ -185,7 +185,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e1) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); } } @@ -235,13 +235,13 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); } } } catch (SQLException e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java index ba4fdd6b6c..f47cf3f813 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.variables.PlayerVariables; */ public class MentorManager { - private static final Logger _log = Logger.getLogger(MentorManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MentorManager.class.getName()); private final Map> _menteeData = new ConcurrentHashMap<>(); private final Map _mentors = new ConcurrentHashMap<>(); @@ -65,7 +65,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -85,7 +85,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -104,7 +104,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } finally { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index f0f9d590c3..07ca9d909e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class PetitionManager { - protected static final Logger _log = Logger.getLogger(PetitionManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PetitionManager.class.getName()); private final Map _pendingPetitions; private final Map _completedPetitions; @@ -55,7 +55,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getCompletedPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() @@ -63,7 +63,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getPendingPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } public boolean acceptPetition(L2PcInstance respondingAdmin, int petitionId) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java index c1df0ca78b..6208afb86b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.Shutdown; */ public class ServerRestartManager { - static final Logger _log = Logger.getLogger(ServerRestartManager.class.getName()); + static final Logger LOGGER = Logger.getLogger(ServerRestartManager.class.getName()); private String nextRestartTime = "unknown"; @@ -72,12 +72,12 @@ public class ServerRestartManager { nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime()); ThreadPool.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000)); - _log.info("Scheduled server restart at " + lastRestart.getTime() + "."); + LOGGER.info("Scheduled server restart at " + lastRestart.getTime() + "."); } } catch (Exception e) { - _log.info("The scheduled server restart config is not set properly, please correct it!"); + LOGGER.info("The scheduled server restart config is not set properly, please correct it!"); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java index 728cb6ca44..38d9a81244 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; public final class SiegeManager { - private static final Logger _log = Logger.getLogger(SiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SiegeManager.class.getName()); private final Map> _controlTowers = new HashMap<>(); private final Map> _flameTowers = new HashMap<>(); @@ -103,7 +103,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -152,7 +152,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); } } @@ -183,7 +183,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); } } _controlTowers.put(castle.getResidenceId(), controlTowers); @@ -289,7 +289,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java index 5e16e5a91f..876a3a1ec9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class MessageDeletionTask implements Runnable { - private static final Logger _log = Logger.getLogger(MessageDeletionTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MessageDeletionTask.class.getName()); final int _msgId; @@ -76,7 +76,7 @@ public final class MessageDeletionTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); } } MailManager.getInstance().deleteMessageInDb(msg.getId()); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/BlockList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/BlockList.java index 627b0dbbe4..3ec7e52fe7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/BlockList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/BlockList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BlockList { - private static Logger _log = Logger.getLogger(BlockList.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlockList.class.getName()); private static final Map> OFFLINE_LIST = new ConcurrentHashMap<>(); private final L2PcInstance _owner; @@ -91,7 +91,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); } return list; } @@ -122,7 +122,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java index 7be7f3cb10..f44f27266b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate; */ public final class CharEffectList { - private static final Logger _log = Logger.getLogger(CharEffectList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); /** Queue containing all effects from buffs for this effect list. */ private volatile Queue _actives; /** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */ @@ -897,7 +897,7 @@ public final class CharEffectList // Passive effects don't need stack type! if (!skill.getAbnormalType().isNone()) { - _log.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); + LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); } // Check for passive skill conditions. diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CursedWeapon.java index d579628d09..a9be2c6a4a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class CursedWeapon implements INamable { - private static final Logger _log = Logger.getLogger(CursedWeapon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CursedWeapon.class.getName()); // _name is the name of the cursed weapon associated with its ID. private final String _name; @@ -95,7 +95,7 @@ public class CursedWeapon implements INamable if ((_player != null) && _player.isOnline()) { // Remove from player - _log.info(_name + " being removed online."); + LOGGER.info(_name + " being removed online."); _player.abortAttack(); @@ -134,7 +134,7 @@ public class CursedWeapon implements INamable else { // Remove from Db - _log.info(_name + " being removed offline."); + LOGGER.info(_name + " being removed offline."); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?"); @@ -145,7 +145,7 @@ public class CursedWeapon implements INamable del.setInt(2, _itemId); if (del.executeUpdate() != 1) { - _log.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); + LOGGER.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); } // Restore the reputation @@ -154,12 +154,12 @@ public class CursedWeapon implements INamable ps.setInt(3, _playerId); if (ps.executeUpdate() != 1) { - _log.warning("Error while updating karma & pkkills for userId " + _playerId); + LOGGER.warning("Error while updating karma & pkkills for userId " + _playerId); } } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); } } } @@ -196,7 +196,7 @@ public class CursedWeapon implements INamable else if (_item != null) { _item.decayMe(); - _log.info(_name + " item has been removed from World."); + LOGGER.info(_name + " item has been removed from World."); } } @@ -492,7 +492,7 @@ public class CursedWeapon implements INamable } catch (SQLException e) { - _log.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); + LOGGER.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java index e1bbddd336..96583b545c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -81,7 +81,7 @@ import com.l2jmobius.gameserver.util.Util; public class L2Clan implements IIdentifiable, INamable { - private static final Logger _log = Logger.getLogger(L2Clan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Clan.class.getName()); // SQL queries private static final String INSERT_CLAN_DATA = "INSERT INTO clan_data (clan_id,clan_name,clan_level,hasCastle,blood_alliance_count,blood_oath_count,ally_id,ally_name,leader_id,crest_id,crest_large_id,ally_crest_id,new_leader_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -273,7 +273,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); } } @@ -313,14 +313,14 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); } } broadcastClanStatus(); broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1).addString(member.getName())); - _log.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); + LOGGER.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); } /** @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - _log.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + getName() + " without clan leader!"); return ""; } return _leader.getName(); @@ -433,7 +433,7 @@ public class L2Clan implements IIdentifiable, INamable final L2ClanMember exMember = _members.remove(objectId); if (exMember == null) { - _log.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); + LOGGER.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); return; } final int leadssubpledge = getLeaderSubPledge(objectId); @@ -888,7 +888,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -932,7 +932,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -948,7 +948,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); } // Update variables at database @@ -991,7 +991,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); } } @@ -1032,7 +1032,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); } } @@ -1062,7 +1062,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); } } @@ -1137,7 +1137,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); } } @@ -1158,7 +1158,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); } } @@ -1200,7 +1200,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); } _notice = notice; @@ -1267,7 +1267,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); + LOGGER.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); } } } @@ -1275,7 +1275,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); } } @@ -1351,7 +1351,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.warning("Subpledge " + subType + " does not exist for clan " + this); + LOGGER.warning("Subpledge " + subType + " does not exist for clan " + this); return oldSkill; } } @@ -1383,7 +1383,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); @@ -1435,7 +1435,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } @@ -1781,7 +1781,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); } } @@ -1890,7 +1890,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); } broadcastToOnlineMembers(new PledgeShowInfoUpdate(_leader.getClan())); @@ -1955,7 +1955,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); } } @@ -1987,7 +1987,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); } } @@ -2023,7 +2023,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } for (L2ClanMember cm : getMembers()) @@ -2058,7 +2058,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); } } } @@ -2174,7 +2174,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); } } } @@ -2717,7 +2717,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); } setLevel(level); @@ -2763,7 +2763,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2800,7 +2800,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); } if (onlyThisClan) @@ -2846,7 +2846,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Mentee.java index 6122c5f6ac..a1eb3d2480 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class L2Mentee { - private static final Logger _log = Logger.getLogger(L2Mentee.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Mentee.class.getName()); private final int _objectId; private String _name; @@ -65,7 +65,7 @@ public class L2Mentee } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } else diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java index 5f14864046..38044ee767 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2Party extends AbstractPlayerGroup { - private static final Logger _log = Logger.getLogger(L2Party.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Party.class.getName()); // @formatter:off private static final double[] BONUS_EXP_SP = @@ -536,7 +536,7 @@ public class L2Party extends AbstractPlayerGroup } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } SystemMessage msg; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Territory.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Territory.java index 41cb26df2b..2ee5d868d2 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Territory.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Territory.java @@ -28,7 +28,7 @@ import com.l2jmobius.commons.util.Rnd; */ public class L2Territory { - private static Logger _log = Logger.getLogger(L2Territory.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2Territory.class.getName()); protected static class Point { @@ -176,7 +176,7 @@ public class L2Territory return new Location(x, y, Rnd.get(zmin, _zMax)); } } - _log.warning("Can't make point for territory " + _terr); + LOGGER.warning("Can't make point for territory " + _terr); return null; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MacroList.java index 737e876e1e..577b101249 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MacroList.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SendMacroList; public class MacroList implements IRestorable { - private static final Logger _log = Logger.getLogger(MacroList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MacroList.class.getName()); private final L2PcInstance _owner; private int _macroId; @@ -154,7 +154,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store macro:", e); + LOGGER.log(Level.WARNING, "could not store macro:", e); } } @@ -169,7 +169,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete macro:", e); + LOGGER.log(Level.WARNING, "could not delete macro:", e); } } @@ -215,7 +215,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store shortcuts:", e); + LOGGER.log(Level.WARNING, "could not store shortcuts:", e); return false; } return true; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ShortCuts.java index 3f8d959ef6..81e2c6f902 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ShortCuts.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; public class ShortCuts implements IRestorable { - private static Logger _log = Logger.getLogger(ShortCuts.class.getName()); + private static Logger LOGGER = Logger.getLogger(ShortCuts.class.getName()); private static final int MAX_SHORTCUTS_PER_BAR = 12; private final L2PcInstance _owner; private final Map _shortCuts = new TreeMap<>(); @@ -100,7 +100,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); } } @@ -165,7 +165,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); } } @@ -195,7 +195,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); return false; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TradeList.java index eeee7d0cae..f0f5a42ae6 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TradeList.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class TradeList { - private static final Logger _log = Logger.getLogger(TradeList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TradeList.class.getName()); private final L2PcInstance _owner; private L2PcInstance _partner; @@ -198,45 +198,45 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Object o = L2World.getInstance().findObject(objectId); if (!(o instanceof L2ItemInstance)) { - _log.warning(_owner.getName() + ": Trying to add something other than an item!"); + LOGGER.warning(_owner.getName() + ": Trying to add something other than an item!"); return null; } final L2ItemInstance item = (L2ItemInstance) o; if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { - _log.warning(_owner.getName() + ": Attempt to add a restricted item!"); + LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) { - _log.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; } if ((count <= 0) || (count > item.getCount())) { - _log.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); return null; } if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -244,7 +244,7 @@ public class TradeList { if (checkitem.getObjectId() == objectId) { - _log.warning(_owner.getName() + ": Attempt to add an item that is already present!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that is already present!"); return null; } } @@ -268,14 +268,14 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); return null; } @@ -286,13 +286,13 @@ public class TradeList if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -315,13 +315,13 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } if (count < 0) { - _log.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); return null; } @@ -335,7 +335,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return null; } partnerList.invalidateConfirmation(); @@ -410,7 +410,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return false; } @@ -475,7 +475,7 @@ public class TradeList // Check for Owner validity if ((_owner == null) || (L2World.getInstance().getPlayer(_owner.getObjectId()) == null)) { - _log.warning("Invalid owner of TradeList"); + LOGGER.warning("Invalid owner of TradeList"); return false; } @@ -485,7 +485,7 @@ public class TradeList final L2ItemInstance item = _owner.checkItemManipulation(titem.getObjectId(), titem.getCount(), "transfer"); if ((item == null) || (item.getCount() < 1)) { - _log.warning(_owner.getName() + ": Invalid Item in TradeList"); + LOGGER.warning(_owner.getName() + ": Invalid Item in TradeList"); return false; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 75c6e98235..91d739cd2d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -632,7 +632,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } @@ -690,7 +690,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -803,7 +803,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = getAggroList().get(target); if (ai == null) { - _log.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 944e723989..1ebbe0e5f3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -176,7 +176,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class L2Character extends L2Object implements ISkillsHolder, IDeletable { - public static final Logger _log = Logger.getLogger(L2Character.class.getName()); + public static final Logger LOGGER = Logger.getLogger(L2Character.class.getName()); private volatile Set> _attackByList; @@ -3278,7 +3278,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Temporary fix for character outside world region errors (should not happen) if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) { - _log.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); + LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); if (isPlayer()) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 8679593b56..884011206b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -624,7 +624,7 @@ public class L2Npc extends L2Character } else { - _log.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); } } } @@ -1189,7 +1189,7 @@ public class L2Npc extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } if (isChannelized()) @@ -1560,7 +1560,7 @@ public class L2Npc extends L2Character if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); + LOGGER.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); return null; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java index 94fe6bb6b5..3dd9a9d68e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java @@ -395,7 +395,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed stopMove().", e); + LOGGER.log(Level.SEVERE, "Failed stopMove().", e); } try @@ -404,7 +404,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed oustPlayers().", e); + LOGGER.log(Level.SEVERE, "Failed oustPlayers().", e); } final ZoneRegion oldZoneRegion = ZoneManager.getInstance().getRegion(this); @@ -415,7 +415,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } oldZoneRegion.removeFromZones(this); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java index 8e72579b54..05339545d3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java @@ -61,7 +61,7 @@ public class L2ControlTowerInstance extends L2Tower } catch (Exception e) { - _log.log(Level.WARNING, "Error at L2ControlTowerInstance", e); + LOGGER.log(Level.WARNING, "Error at L2ControlTowerInstance", e); } } _guards.clear(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 6c554e10e0..91548e2a10 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -100,7 +100,7 @@ public class L2DecoyInstance extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } @@ -126,7 +126,7 @@ public class L2DecoyInstance extends L2Character } catch (Throwable e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index f9aa07f44d..97c2348dec 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -123,7 +123,7 @@ public class L2DefenderInstance extends L2Attackable if ((_fort == null) && (_castle == null)) { - _log.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); + LOGGER.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 4fb7bbb976..baab09b858 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -219,7 +219,7 @@ public final class L2DoorInstance extends L2Character } else { - _log.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); + LOGGER.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 71096be532..1519fc6308 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -74,14 +74,14 @@ public class L2MerchantInstance extends L2NpcInstance final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } if (!buyList.isNpcAllowed(getId())) { - _log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); + LOGGER.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index d746a2674c..d8975e3b91 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -1333,7 +1333,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Attempted to remove unknown RecipeList: " + recipeId); + LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } for (Shortcut sc : getAllShortCuts()) @@ -1358,7 +1358,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -1374,7 +1374,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -2626,7 +2626,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Skipping null auto-get skill for player: " + toString()); + LOGGER.warning("Skipping null auto-get skill for player: " + toString()); } } } @@ -3278,7 +3278,7 @@ public final class L2PcInstance extends L2Playable final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); + LOGGER.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); return null; } // Sends message to client if requested @@ -3321,7 +3321,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof L2EtcItem ? (L2EtcItem) item : null); if (handler == null) { - _log.warning("No item handler registered for Herb ID " + item.getId() + "!"); + LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!"); } else { @@ -3839,7 +3839,7 @@ public final class L2PcInstance extends L2Playable // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { - _log.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); return null; } @@ -3847,19 +3847,19 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return null; } if ((count < 0) || ((count > 1) && !item.isStackable())) { - _log.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); return null; } if (count > item.getCount()) { - _log.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); return null; } @@ -3888,7 +3888,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_protectEndTime > 0))) { - _log.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _protectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -3898,7 +3898,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_teleportProtectEndTime > 0))) { - _log.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _teleportProtectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -4413,7 +4413,7 @@ public final class L2PcInstance extends L2Playable if (!object.isItem()) { // dont try to pickup anything that is not an item :) - _log.warning(this + " trying to pickup wrong target." + getTarget()); + LOGGER.warning(this + " trying to pickup wrong target." + getTarget()); return; } @@ -4513,7 +4513,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -5175,11 +5175,11 @@ public final class L2PcInstance extends L2Playable if (isKarmaDrop) { - _log.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } else { - _log.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } if (++dropCount >= dropLimit) @@ -6273,7 +6273,7 @@ public final class L2PcInstance extends L2Playable L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level); if (accessLevel == null) { - _log.warning("Can't find access level " + level + " for character " + toString()); + LOGGER.warning("Can't find access level " + level + " for character " + toString()); accessLevel = AdminData.getInstance().getAccessLevel(0); } @@ -6282,7 +6282,7 @@ public final class L2PcInstance extends L2Playable accessLevel = AdminData.getInstance().getAccessLevel(Config.DEFAULT_ACCESS_LEVEL); if (accessLevel == null) { - _log.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); + LOGGER.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); accessLevel = AdminData.getInstance().getAccessLevel(0); Config.DEFAULT_ACCESS_LEVEL = 0; } @@ -6308,7 +6308,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); + LOGGER.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); } } @@ -6316,11 +6316,11 @@ public final class L2PcInstance extends L2Playable if (accessLevel == null) { - _log.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); + LOGGER.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); } else if (level > 0) { - _log.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); + LOGGER.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); } } @@ -6429,7 +6429,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed updating character online status.", e); + LOGGER.log(Level.SEVERE, "Failed updating character online status.", e); } } @@ -6482,7 +6482,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); return false; } return true; @@ -6631,7 +6631,7 @@ public final class L2PcInstance extends L2Playable catch (Exception e) { player.setBaseClass(activeClassId); - _log.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); + LOGGER.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); } // Restore Subclass Data (cannot be done earlier in function) @@ -6654,7 +6654,7 @@ public final class L2PcInstance extends L2Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - _log.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -6795,7 +6795,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed loading character.", e); + LOGGER.log(Level.SEVERE, "Failed loading character.", e); } return player; } @@ -6885,7 +6885,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); } return true; } @@ -6993,7 +6993,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); } } @@ -7023,7 +7023,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); } } @@ -7039,7 +7039,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); } } @@ -7054,7 +7054,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.severe("Could not delete premium item: " + e); + LOGGER.severe("Could not delete premium item: " + e); } } @@ -7172,7 +7172,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); } } @@ -7202,7 +7202,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); } } @@ -7326,7 +7326,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store char effect data: ", e); } } @@ -7358,7 +7358,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char item reuse data: ", e); + LOGGER.log(Level.WARNING, "Could not store char item reuse data: ", e); } } @@ -7447,7 +7447,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); } } @@ -7507,12 +7507,12 @@ public final class L2PcInstance extends L2Playable } // else // { - // _log.warning("Could not store new skill, it's null!"); + // LOGGER.warning("Could not store new skill, it's null!"); // } } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7547,7 +7547,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7575,7 +7575,7 @@ public final class L2PcInstance extends L2Playable if (skill == null) { - _log.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); + LOGGER.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); continue; } @@ -7598,7 +7598,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); } } @@ -7656,7 +7656,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } } @@ -7722,7 +7722,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); } } @@ -7786,7 +7786,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); } // Calculate henna modifiers of this player. @@ -7854,7 +7854,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed removing character henna.", e); + LOGGER.log(Level.SEVERE, "Failed removing character henna.", e); } // Calculate Henna modifiers of this L2PcInstance @@ -7953,7 +7953,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed saving character henna.", e); + LOGGER.log(Level.SEVERE, "Failed saving character henna.", e); } // Task for henna duration @@ -8108,7 +8108,7 @@ public final class L2PcInstance extends L2Playable if (isLocked()) { - _log.warning("Player " + getName() + " tried to restart/logout during class change."); + LOGGER.warning("Player " + getName() + " tried to restart/logout during class change."); return false; } @@ -8459,7 +8459,7 @@ public final class L2PcInstance extends L2Playable if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { - _log.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); + LOGGER.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -9586,7 +9586,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); return false; } @@ -9701,7 +9701,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -9789,7 +9789,7 @@ public final class L2PcInstance extends L2Playable final L2PcTemplate pcTemplate = PlayerTemplateData.getInstance().getTemplate(classId); if (pcTemplate == null) { - _log.severe("Missing template for classId: " + classId); + LOGGER.severe("Missing template for classId: " + classId); throw new Error(); } // Set the template of the L2PcInstance @@ -9872,7 +9872,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -10112,7 +10112,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10124,7 +10124,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogin(this), this); @@ -10609,7 +10609,7 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return false; } @@ -10751,7 +10751,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) @@ -10759,13 +10759,13 @@ public final class L2PcInstance extends L2Playable { if (!isOnline()) { - _log.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); + LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } setOnlineStatus(false, true); } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10777,7 +10777,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10789,7 +10789,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove combat flag @@ -10812,7 +10812,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10825,7 +10825,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10837,7 +10837,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Recommendations must be saved before task (timer) is canceled @@ -10847,7 +10847,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop the HP/MP/CP Regeneration task (scheduled tasks) try @@ -10856,7 +10856,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10865,7 +10865,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop crafting, if in progress @@ -10875,7 +10875,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Cancel Attak or Cast @@ -10885,7 +10885,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isChannelized()) @@ -10906,7 +10906,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // If a Party is in progress, leave it (and festival party) @@ -10918,7 +10918,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10953,7 +10953,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // returns pet to control item } @@ -10971,7 +10971,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10991,7 +10991,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11011,7 +11011,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove player from instance @@ -11024,7 +11024,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11034,7 +11034,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its inventory and remove them from the world @@ -11044,7 +11044,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its warehouse and remove them from the world @@ -11054,7 +11054,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (Config.WAREHOUSE_CACHE) { @@ -11067,7 +11067,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11076,7 +11076,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isCursedWeaponEquipped()) @@ -11087,7 +11087,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11135,7 +11135,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); } // Stop all passives and augment options @@ -11461,7 +11461,7 @@ public final class L2PcInstance extends L2Playable { if (killer == null) { - _log.warning(this + " called calculateShilensBreathDebuffLevel with killer null!"); + LOGGER.warning(this + " called calculateShilensBreathDebuffLevel with killer null!"); return; } @@ -11922,7 +11922,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); + LOGGER.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); } } } @@ -12051,7 +12051,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); } } @@ -12071,7 +12071,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -12220,7 +12220,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); } @@ -12241,7 +12241,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); } } @@ -12460,7 +12460,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); } } @@ -12557,7 +12557,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); + LOGGER.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); } } } @@ -12583,7 +12583,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); } } @@ -12832,12 +12832,12 @@ public final class L2PcInstance extends L2Playable if (nextLevel == -1) { - _log.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from player " + toString()); removeSkill(skill, true); // there is no lower skill } else { - _log.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } @@ -12983,7 +12983,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); } } @@ -13027,7 +13027,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); } } @@ -13047,7 +13047,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); } } @@ -13815,14 +13815,14 @@ public final class L2PcInstance extends L2Playable { sendMessage("The command " + command.substring(6) + " does not exist!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, getAccessLevel())) { sendMessage("You don't have the access rights to use this command!"); - _log.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); + LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 5718895451..ca24302555 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -576,7 +576,7 @@ public class L2PetInstance extends L2Summon final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -771,7 +771,7 @@ public class L2PetInstance extends L2Summon if (removedItem == null) { - _log.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); + LOGGER.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); } else { @@ -1059,7 +1059,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not store pet effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store pet effect data: ", e); } } @@ -1098,7 +1098,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { @@ -1404,7 +1404,7 @@ public class L2PetInstance extends L2Summon } else { - _log.warning("Pet control item null, for pet: " + toString()); + LOGGER.warning("Pet control item null, for pet: " + toString()); } super.setName(name); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 2c113f3992..fcd45fb1b0 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -376,7 +376,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store summon effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store summon effect data: ", e); } } @@ -442,7 +442,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index 23ca608434..2fcc796ffa 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -55,7 +55,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2VillageMasterInstance extends L2NpcInstance { - private static Logger _log = Logger.getLogger(L2VillageMasterInstance.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2VillageMasterInstance.class.getName()); public L2VillageMasterInstance(L2NpcTemplate template) { @@ -627,7 +627,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } catch (PatternSyntaxException e) { - _log.warning("ERROR: Wrong pattern for clan name!"); + LOGGER.warning("ERROR: Wrong pattern for clan name!"); pattern = Pattern.compile(".*"); } return pattern.matcher(name).matches(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java index b448f021a8..d2cd097234 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java @@ -93,7 +93,7 @@ public class PetStat extends SummonStat { if (getActiveChar() != null) { - _log.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); + LOGGER.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); } throw e; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index aaecadf5c5..222d29419e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp public class PlayableStat extends CharStat { - protected static final Logger _log = Logger.getLogger(PlayableStat.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PlayableStat.class.getName()); public PlayableStat(L2Playable activeChar) { @@ -195,7 +195,7 @@ public class PlayableStat extends CharStat { if (value < 0) { - _log.warning("wrong usage"); + LOGGER.warning("wrong usage"); return false; } final long currentSp = getSp(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index 352a7719ae..0ce091c546 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.stats.Stats; public class CharStatus { - protected static final Logger _log = Logger.getLogger(CharStatus.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(CharStatus.class.getName()); private final L2Character _activeChar; @@ -449,7 +449,7 @@ public class CharStatus } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java index 3fa6773fd2..1b1003f76d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc; */ public class RandomAnimationTask implements Runnable { - private static final Logger _log = Logger.getLogger(RandomAnimationTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RandomAnimationTask.class.getName()); private final L2Npc _npc; private boolean _stopTask; @@ -70,7 +70,7 @@ public class RandomAnimationTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); + LOGGER.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java index 39eaa5b37a..755ae87ebc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction; */ public class TrapTask implements Runnable { - private static final Logger _log = Logger.getLogger(TrapTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TrapTask.class.getName()); private static final int TICK = 1000; // 1s private final L2TrapInstance _trap; @@ -65,7 +65,7 @@ public class TrapTask implements Runnable } catch (Exception e) { - _log.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); _trap.unSummon(); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java index 1801510a6b..a08fc73212 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.LeaveWorld; */ public class GameGuardCheckTask implements Runnable { - private static final Logger _log = Logger.getLogger(GameGuardCheckTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GameGuardCheckTask.class.getName()); private final L2PcInstance _player; @@ -47,7 +47,7 @@ public class GameGuardCheckTask implements Runnable if ((client != null) && !client.isAuthedGG() && _player.isOnline()) { AdminData.getInstance().broadcastMessageToGMs("Client " + client + " failed to reply GameGuard query and is being kicked!"); - _log.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); + LOGGER.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); client.close(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 23cfffc2bb..fc78d6a4db 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.Disconnection; */ public final class IllegalPlayerActionTask implements Runnable { - private static final Logger _log = Logger.getLogger("audit"); + private static final Logger LOGGER = Logger.getLogger("audit"); private final String _message; private final IllegalActionPunishmentType _punishment; @@ -74,7 +74,7 @@ public final class IllegalPlayerActionTask implements Runnable @Override public void run() { - _log.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); + LOGGER.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); AdminData.getInstance().broadcastMessageToGMs(_message); if (!_actor.isGM()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index 8b4bd27212..73c3219140 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PetFeedTask implements Runnable { - private static final Logger _log = Logger.getLogger(PetFeedTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PetFeedTask.class.getName()); private final L2PcInstance _player; @@ -99,7 +99,7 @@ public class PetFeedTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); + LOGGER.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/Announcement.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/Announcement.java index 3873f71d14..4e5aa84b0f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/Announcement.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/Announcement.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class Announcement implements IAnnouncement { - protected static final Logger _log = Logger.getLogger(Announcement.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Announcement.class.getName()); private static final String INSERT_QUERY = "INSERT INTO announcements (type, content, author) VALUES (?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE announcements SET type = ?, content = ?, author = ? WHERE id = ?"; @@ -125,7 +125,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -145,7 +145,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -162,7 +162,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java index f85c9affc0..a18af9fc50 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,7 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; - private static final Logger _log = Logger.getLogger(AnnouncementType.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) { @@ -40,7 +40,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); return NORMAL; } @@ -53,7 +53,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); return NORMAL; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index a47ba1a0a5..ebee3cd82c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -114,7 +114,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -137,7 +137,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/buylist/Product.java index 97571235ed..03b1a51b6b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; */ public final class Product { - private static final Logger _log = Logger.getLogger(Product.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Product.class.getName()); private final int _buyListId; private final L2Item _item; @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - _log.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index 8d2e52b55c..6eefb3679e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public final class ConditionPlayerGrade extends Condition { - protected static final Logger _log = Logger.getLogger(ConditionPlayerGrade.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ConditionPlayerGrade.class.getName()); // conditional values public static final int COND_NO_GRADE = 0x0001; public static final int COND_D_GRADE = 0x0002; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 90ac2108aa..805960c36b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public abstract class AbstractEffect { - protected static final Logger _log = Logger.getLogger(AbstractEffect.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEffect.class.getName()); private int _ticks; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index 6892d0798a..ce7a68dcc7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -56,7 +56,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class BlockCheckerEngine { - protected static final Logger _log = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -309,7 +309,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); + LOGGER.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); } } @@ -417,7 +417,7 @@ public final class BlockCheckerEngine // Wrong arena passed, stop event if (_arena == -1) { - _log.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); + LOGGER.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); return; } _isStarted = true; @@ -508,7 +508,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Spawn the block carrying girl @@ -530,8 +530,8 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } @@ -558,7 +558,7 @@ public final class BlockCheckerEngine { if (_spawn == null) { - _log.warning("HBCE: Block Carrying Girl is null"); + LOGGER.warning("HBCE: Block Carrying Girl is null"); return; } SpawnTable.getInstance().deleteSpawn(_spawn, false); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java index a6faf0b0df..4fa38d85d4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public final class Castle extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Castle.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Castle.class.getName()); private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); @@ -212,7 +212,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -232,7 +232,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; } @@ -542,7 +542,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } oldOwner.setCastleId(0); // Unset has castle flag for old owner for (L2PcInstance member : oldOwner.getOnlineMembers(0)) @@ -683,7 +683,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); } } @@ -704,7 +704,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); } } @@ -724,7 +724,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -801,7 +801,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); } } @@ -821,7 +821,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -848,7 +848,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); } } } @@ -891,7 +891,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -1042,7 +1042,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); } } @@ -1086,7 +1086,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -1110,7 +1110,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); } } final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(getResidenceId()).get(towerIndex); @@ -1135,7 +1135,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -1184,7 +1184,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); return; } spawn.setX(holder.getX()); @@ -1219,7 +1219,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } _castleSide = side; Broadcast.toAllOnlinePlayers(new ExCastleState(this)); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Couple.java index c31232e232..c40e7d454a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Couple.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class Couple { - private static final Logger _log = Logger.getLogger(Couple.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Couple.class.getName()); private int _Id = 0; private int _player1Id = 0; @@ -67,7 +67,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); } } @@ -99,7 +99,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); } } @@ -117,7 +117,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); } } @@ -131,7 +131,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java index d601203f8d..826a7beece 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class Duel { - protected static final Logger _log = Logger.getLogger(Duel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Duel.class.getName()); public static final int DUELSTATE_NODUEL = 0; public static final int DUELSTATE_DUELLING = 1; @@ -223,7 +223,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); } } } @@ -266,7 +266,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); } } } @@ -291,7 +291,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); } } } @@ -994,7 +994,7 @@ public class Duel { if ((player != _playerA) && (player != _playerB)) { - _log.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); + LOGGER.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); } if (_playerA == player) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java index 75ec9236b8..aaece02dae 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Fort extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Fort.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Fort.class.getName()); private final List _doors = new ArrayList<>(); private L2StaticObjectInstance _flagPole = null; @@ -227,7 +227,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Fort extends AbstractResidence { if (clan == null) { - _log.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); + LOGGER.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); return false; } @@ -396,7 +396,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } removeOwner(true); } @@ -496,7 +496,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); } } @@ -606,7 +606,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } @@ -627,7 +627,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); } } @@ -647,7 +647,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -744,7 +744,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -775,7 +775,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); } } @@ -844,7 +844,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -968,7 +968,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); } } } @@ -1008,7 +1008,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); } } @@ -1154,7 +1154,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1183,7 +1183,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1213,7 +1213,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1249,7 +1249,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 053af69e9d..80e02260d5 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class FortSiege implements Siegable { - protected static final Logger _log = Logger.getLogger(FortSiege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortSiege.class.getName()); // SQL private static final String DELETE_FORT_SIEGECLANS_BY_CLAN_ID = "DELETE FROM fortsiege_clans WHERE fort_id = ? AND clan_id = ?"; @@ -82,7 +82,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -169,12 +169,12 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); + LOGGER.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); } } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); } } } @@ -195,7 +195,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -218,7 +218,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -293,7 +293,7 @@ public class FortSiege implements Siegable getFort().setVisibleFlag(true); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -343,7 +343,7 @@ public class FortSiege implements Siegable announceToPlayer(sm); saveFortSiege(); - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -533,7 +533,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -689,7 +689,7 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); } } } @@ -816,7 +816,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); } } @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new FortSiege.ScheduleStartSiegeTask(60), 0); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); } } } @@ -1013,7 +1013,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1066,7 +1066,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1092,7 +1092,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); } } @@ -1120,7 +1120,7 @@ public class FortSiege implements Siegable catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/L2Event.java index be28d47897..dbdbdae0e9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/L2Event.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/L2Event.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class L2Event { - protected static final Logger _log = Logger.getLogger(L2Event.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2Event.class.getName()); public static EventState eventState = EventState.OFF; public static String _eventName = ""; public static String _eventCreator = ""; @@ -151,7 +151,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); } } } @@ -187,7 +187,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); } } @@ -308,7 +308,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); } } @@ -399,7 +399,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event participation, an error has occured."; } @@ -475,7 +475,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event, an error has occured."; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Siege.java index c3b017869d..d18783ec7d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class Siege implements Siegable { - protected static final Logger _log = Logger.getLogger(Siege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Siege.class.getName()); // typeId's public static final byte OWNER = -1; @@ -142,7 +142,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -215,7 +215,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -781,7 +781,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -798,7 +798,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); } } @@ -983,7 +983,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); } } @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - _log.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); loadSiegeClan(); @@ -1275,7 +1275,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1360,7 +1360,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1428,7 +1428,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); } } @@ -1482,7 +1482,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); } _controlTowerCount = _controlTowers.size(); } @@ -1506,7 +1506,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 26d733e4c1..12551f22ba 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -161,7 +161,7 @@ import com.l2jmobius.gameserver.util.MinionList; */ public abstract class AbstractScript extends ManagedScript implements IEventTimerEvent, IEventTimerCancel { - protected static final Logger _log = Logger.getLogger(AbstractScript.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractScript.class.getName()); private final Map> _registeredIds = new ConcurrentHashMap<>(); private final Queue _listeners = new PriorityBlockingQueue<>(); private volatile TimerExecutor _timerExecutor; @@ -185,7 +185,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime public void onTimerEvent(String event, StatsSet params, L2Npc npc, L2PcInstance player) { - _log.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); + LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } public void onTimerCancel(String event, StatsSet params, L2Npc npc, L2PcInstance player) @@ -229,17 +229,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final EventType eventType = listener.value(); if (method.getParameterCount() != 1) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); continue; } else if (!eventType.isEventClass(method.getParameterTypes()[0])) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); continue; } else if (!eventType.isReturnClass(method.getReturnType())) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); continue; } @@ -275,7 +275,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final Range range = (Range) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -291,7 +291,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -306,12 +306,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final NpcLevelRange range = (NpcLevelRange) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -329,12 +329,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -391,7 +391,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -409,7 +409,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -499,7 +499,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -517,7 +517,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -536,7 +536,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -553,7 +553,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -596,7 +596,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -613,7 +613,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -633,7 +633,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -651,7 +651,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -671,7 +671,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -689,7 +689,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -709,7 +709,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -727,7 +727,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -1018,7 +1018,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1036,7 +1036,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1723,7 +1723,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } @@ -1843,7 +1843,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } } @@ -2216,7 +2216,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime if ((x == 0) && (y == 0)) { - _log.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); + LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); return null; } @@ -2258,7 +2258,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } catch (Exception e) { - _log.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); + LOGGER.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); } return null; @@ -3138,7 +3138,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (!door.isOpen()) { @@ -3156,7 +3156,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (door.isOpen()) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java index c25f5189f6..231cef15b4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public final class EventDispatcher { - private static final Logger _log = Logger.getLogger(EventDispatcher.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EventDispatcher.class.getName()); protected EventDispatcher() { @@ -83,7 +83,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -172,7 +172,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -237,7 +237,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java index 4b21e92c36..97dc1b1142 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class AnnotationEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(AnnotationEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnotationEventListener.class.getName()); private final Method _callback; public AnnotationEventListener(ListenersContainer container, EventType type, Method callback, Object owner, int priority) @@ -54,7 +54,7 @@ public class AnnotationEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java index 0d5b4a601c..56fb7b03ec 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class FunctionEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(FunctionEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FunctionEventListener.class.getName()); private final Function _callback; @SuppressWarnings("unchecked") @@ -50,7 +50,7 @@ public class FunctionEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index cb65209f93..1501c166e8 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public abstract class ItemContainer { - protected static final Logger _log = Logger.getLogger(ItemContainer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ItemContainer.class.getName()); protected final Map _items = new ConcurrentHashMap<>(); @@ -287,7 +287,7 @@ public abstract class ItemContainer final L2Item template = ItemTable.getInstance().getTemplate(itemId); if (template == null) { - _log.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); + LOGGER.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); return null; } @@ -702,7 +702,7 @@ public abstract class ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index cb2d9362ba..5bb5770412 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -139,7 +139,7 @@ public class Mail extends ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index 7fce82d4af..c7a3128aa9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; public class PcInventory extends Inventory { - private static final Logger _log = Logger.getLogger(PcInventory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PcInventory.class.getName()); private final L2PcInstance _owner; private L2ItemInstance _adena; @@ -761,7 +761,7 @@ public class PcInventory extends Inventory } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); } return paperdoll; } @@ -974,7 +974,7 @@ public class PcInventory extends Inventory { if ((type != EtcItemType.ARROW) && (type != EtcItemType.BOLT)) { - _log.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); + LOGGER.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java index 37e0216702..ded347d03a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java @@ -71,7 +71,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "addItem()", e); + LOGGER.log(Level.SEVERE, "addItem()", e); } } @@ -93,7 +93,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } _items.clear(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index a988fe1fec..c5a70ee9be 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.items.type.ItemType; */ public abstract class AbstractEnchantItem { - protected static final Logger _log = Logger.getLogger(AbstractEnchantItem.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); private static final ItemType[] ENCHANT_TYPES = new ItemType[] { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java index d4af9b02f5..2a7e5652dc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.holders.RangeChanceHolder; */ public final class EnchantItemGroup { - private static final Logger _log = Logger.getLogger(EnchantItemGroup.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); private final List _chances = new ArrayList<>(); private final String _name; @@ -68,10 +68,10 @@ public final class EnchantItemGroup return holder.getChance(); } } - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); return _chances.get(_chances.size() - 1).getChance(); } - _log.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); return -1; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index f7595701a1..98cb998ee2 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -142,14 +142,14 @@ public final class EnchantScroll extends AbstractEnchantItem { if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) { - _log.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); return -1; } final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); if (group == null) { - _log.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); return -1; } return group.getChance(enchantItem.getEnchantLevel()); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 076cfe435a..2ca4331a23 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -1281,7 +1281,7 @@ public final class L2ItemInstance extends L2Object */ public static class ScheduleConsumeManaTask implements Runnable { - private static final Logger _log = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); private final L2ItemInstance _shadowItem; public ScheduleConsumeManaTask(L2ItemInstance item) @@ -1302,7 +1302,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 7556af343a..46097d99e5 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public abstract class AbstractOlympiadGame { - protected static final Logger _log = Logger.getLogger(AbstractOlympiadGame.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractOlympiadGame.class.getName()); protected static final Logger _logResults = Logger.getLogger("olympiad"); protected static final String POINTS = "olympiad_points"; @@ -186,7 +186,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return false; } return true; @@ -287,7 +287,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -340,7 +340,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -387,7 +387,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "playerStatusBack()", e); + LOGGER.log(Level.WARNING, "playerStatusBack()", e); } } @@ -434,7 +434,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java index 6069b35ec8..714e479916 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OlympiadGameManager implements Runnable { - private static final Logger _log = Logger.getLogger(OlympiadGameManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlympiadGameManager.class.getName()); private static final int STADIUM_COUNT = 80; // TODO dynamic private volatile boolean _battleStarted = false; @@ -60,7 +60,7 @@ public class OlympiadGameManager implements Runnable _tasks.add(stadium); } - _log.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); + LOGGER.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); } public static OlympiadGameManager getInstance() @@ -188,7 +188,7 @@ public class OlympiadGameManager implements Runnable { OlympiadManager.getInstance().clearRegistered(); _battleStarted = false; - _log.info("Olympiad System: All current games finished."); + LOGGER.info("Olympiad System: All current games finished."); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 2108adfcb2..c82b326970 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -167,7 +167,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return false; } return result; @@ -388,7 +388,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (_playerTwo.isDefaulted()) @@ -415,7 +415,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (winside == 1) @@ -431,7 +431,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -536,7 +536,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -673,7 +673,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (SQLException e) { - _log.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); + LOGGER.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index d18e278286..8ef4db814e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class OlympiadGameTask implements Runnable { - protected static final Logger _log = Logger.getLogger(OlympiadGameTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(OlympiadGameTask.class.getName()); private static final int[] TELEPORT_TO_ARENA_TIMES = { @@ -163,7 +163,7 @@ public final class OlympiadGameTask implements Runnable { if ((game != null) && (_state != GameState.IDLE)) { - _log.warning("Attempt to overwrite non-finished game in state " + _state); + LOGGER.warning("Attempt to overwrite non-finished game in state " + _state); return; } @@ -352,14 +352,14 @@ public final class OlympiadGameTask implements Runnable case CLEANUP: case IDLE: { - _log.warning("Unable to return players back in town, exception: " + e.getMessage()); + LOGGER.warning("Unable to return players back in town, exception: " + e.getMessage()); _state = GameState.IDLE; _game = null; return; } } - _log.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); _state = GameState.GAME_STOPPED; ThreadPool.schedule(this, 1000); } @@ -417,7 +417,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -446,7 +446,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -463,7 +463,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; @@ -480,7 +480,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -489,7 +489,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -498,7 +498,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -507,7 +507,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -522,7 +522,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -531,7 +531,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -540,7 +540,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -549,7 +549,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -558,7 +558,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index d4720828f5..037b43e894 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; */ public class PunishmentTask implements Runnable { - protected static final Logger _log = Logger.getLogger(PunishmentTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PunishmentTask.class.getName()); private static final String INSERT_QUERY = "INSERT INTO punishments (`key`, `affect`, `type`, `expiration`, `reason`, `punishedBy`) VALUES (?, ?, ?, ?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE punishments SET expiration = ? WHERE id = ?"; @@ -203,7 +203,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); } } @@ -230,7 +230,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 495a0d648b..0a5994e0d5 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class LongTimeEvent extends Quest { - protected Logger _log = Logger.getLogger(getClass().getName()); + protected Logger LOGGER = Logger.getLogger(getClass().getName()); protected String _eventName; boolean _enableShrines = false; @@ -86,17 +86,17 @@ public class LongTimeEvent extends Quest if (_eventPeriod.isWithinRange(new Date())) { startEvent(); - _log.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); + LOGGER.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); } else if (_eventPeriod.getStartDate().after(new Date())) { final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); - _log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); + LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } else { - _log.info("Event " + _eventName + " has passed... Ignored "); + LOGGER.info("Event " + _eventName + " has passed... Ignored "); } } } @@ -179,19 +179,19 @@ public class LongTimeEvent extends Quest if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); continue; } if (minCount > maxCount) { - _log.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); continue; } if ((finalChance < 10000) || (finalChance > 1000000)) { - _log.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); continue; } @@ -199,7 +199,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); } } } @@ -221,7 +221,7 @@ public class LongTimeEvent extends Quest if (NpcData.getInstance().getTemplate(npcId) == null) { - _log.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); + LOGGER.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); continue; } @@ -229,7 +229,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java index 0c8a3b044b..b1ef6c3f23 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -84,7 +84,7 @@ import com.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class Quest extends AbstractScript implements IIdentifiable { - public static final Logger _log = Logger.getLogger(Quest.class.getName()); + public static final Logger LOGGER = Logger.getLogger(Quest.class.getName()); /** Map containing lists of timers from the name of the timer. */ private volatile Map> _questTimers = null; @@ -523,7 +523,7 @@ public class Quest extends AbstractScript implements IIdentifiable { showError(trigger.getActingPlayer(), e); } - _log.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); return; } if (trigger.getActingPlayer() != null) @@ -543,7 +543,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); } } @@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); } } @@ -864,7 +864,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); } } @@ -933,7 +933,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); } } @@ -948,7 +948,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); } } @@ -963,7 +963,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); } } @@ -978,7 +978,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); } } @@ -995,7 +995,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); } return false; } @@ -1008,7 +1008,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); return; } } @@ -1513,10 +1513,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public boolean showError(L2PcInstance player, Throwable t) { - _log.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); + LOGGER.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); if (t.getMessage() == null) { - _log.warning(getClass().getSimpleName() + ": " + t.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + t.getMessage()); } if ((player != null) && player.getAccessLevel().isGm()) { @@ -1607,7 +1607,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - _log.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1638,7 +1638,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - _log.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); @@ -1656,7 +1656,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1680,7 +1680,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1703,7 +1703,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not update char quest:", e); + LOGGER.log(Level.WARNING, "could not update char quest:", e); } } @@ -1724,7 +1724,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Unable to delete char quest!", e); + LOGGER.log(Level.WARNING, "Unable to delete char quest!", e); } } @@ -1748,7 +1748,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete char quest:", e); + LOGGER.log(Level.WARNING, "could not delete char quest:", e); } } @@ -2804,7 +2804,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if ((id != 0) && (ItemTable.getInstance().getTemplate(id) == null)) { - _log.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); } } _questItemIds = items; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 23c0acc8d1..40aa1878fd 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.util.Util; */ public final class QuestState { - protected static final Logger _log = Logger.getLogger(QuestState.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestState.class.getName()); /** The name of the quest of this QuestState */ private final String _questName; @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - _log.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - _log.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 64f6afb219..4013de0733 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class QuestTimer { - protected static final Logger _log = Logger.getLogger(QuestTimer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestTimer.class.getName()); public class ScheduleTimerTask implements Runnable { @@ -48,7 +48,7 @@ public class QuestTimer } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java index 64f04389a2..1c7ac4a6ab 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance; */ public class L2ShuttleEngine implements Runnable { - private static final Logger _log = Logger.getLogger(L2ShuttleEngine.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2ShuttleEngine.class.getName()); private static final int DELAY = 15 * 1000; @@ -117,7 +117,7 @@ public class L2ShuttleEngine implements Runnable } catch (Exception e) { - _log.log(Level.INFO, e.getMessage(), e); + LOGGER.log(Level.INFO, e.getMessage(), e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java index 6148235551..19a1a61b20 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Skill implements IIdentifiable { - private static final Logger _log = Logger.getLogger(Skill.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Skill.class.getName()); /** Skill ID. */ private final int _id; @@ -295,7 +295,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); + LOGGER.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); } } } @@ -426,7 +426,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); + LOGGER.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); } } } @@ -1139,7 +1139,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); } } activeChar.sendMessage("Target type of skill " + this + " is not currently handled."); @@ -1168,7 +1168,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); } } activeChar.sendMessage("Target affect scope of skill " + this + " is not currently handled."); @@ -1196,7 +1196,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); } } else @@ -1608,7 +1608,7 @@ public final class Skill implements IIdentifiable } else { - _log.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); + LOGGER.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 66b9f7e4b2..8e607be078 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SkillChannelizer implements Runnable { - private static final Logger _log = Logger.getLogger(SkillChannelizer.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SkillChannelizer.class.getName()); private final L2Character _channelizer; private List _channelized; @@ -72,7 +72,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); + LOGGER.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); return; } @@ -86,7 +86,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (!isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); + LOGGER.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); return; } @@ -192,7 +192,7 @@ public class SkillChannelizer implements Runnable final Skill channeledSkill = SkillData.getInstance().getSkill(skill.getChannelingSkillId(), skillLevel); if (channeledSkill == null) { - _log.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); + LOGGER.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); _channelizer.abortCast(); return; } @@ -229,7 +229,7 @@ public class SkillChannelizer implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); + LOGGER.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java index 7d6f856c18..8b91fc77d2 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class AccountVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(AccountVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AccountVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM account_gsdata WHERE account_name = ?"; @@ -64,7 +64,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); return false; } finally @@ -107,7 +107,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); return false; } finally @@ -134,7 +134,7 @@ public class AccountVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); return false; } return true; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java index 390e2f166a..50fcf2ab6f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ClanVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ClanVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM clan_variables WHERE clanId = ?"; @@ -64,7 +64,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -107,7 +107,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -134,7 +134,7 @@ public class ClanVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java index bcd7f557fd..c7ba2ff071 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ItemVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ItemVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM item_variables WHERE id = ?"; @@ -69,7 +69,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); + LOGGER.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); return false; } return true; @@ -93,7 +93,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -136,7 +136,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -163,7 +163,7 @@ public class ItemVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java index 999b4cdd64..85508e687b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class PlayerVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(PlayerVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PlayerVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM character_variables WHERE charId = ?"; @@ -90,7 +90,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); return false; } finally @@ -133,7 +133,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); return false; } finally @@ -160,7 +160,7 @@ public class PlayerVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); return false; } return true; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java index 8a54b645b0..adfcec2ca5 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java @@ -66,7 +66,7 @@ public abstract class L2ZoneRespawn extends L2ZoneType } default: { - _log.warning(getClass().getSimpleName() + ": Unknown location type: " + type); + LOGGER.warning(getClass().getSimpleName() + ": Unknown location type: " + type); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 3beea85891..a6790a61d9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public abstract class L2ZoneType extends ListenersContainer { - protected static final Logger _log = Logger.getLogger(L2ZoneType.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2ZoneType.class.getName()); private final int _id; protected L2ZoneForm _zone; @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - _log.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 043a66b6f4..33d3bb8723 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -113,7 +113,7 @@ public final class L2EffectZone extends L2ZoneType final String[] skillSplit = skill.split("-"); if (skillSplit.length != 2) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); } else { @@ -125,7 +125,7 @@ public final class L2EffectZone extends L2ZoneType { if (!skill.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java index 56940c6507..7cdbe1bb0a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -63,7 +63,7 @@ import io.netty.channel.ChannelHandlerContext; public final class L2GameClient extends ChannelInboundHandler { protected static final Logger LOGGER = Logger.getLogger(L2GameClient.class.getName()); - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private final int _objectId; @@ -111,13 +111,13 @@ public final class L2GameClient extends ChannelInboundHandler final InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); _addr = address.getAddress(); _channel = ctx.channel(); - LOG_ACCOUNTING.finer("Client Connected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Connected: " + ctx.channel()); } @Override public void channelInactive(ChannelHandlerContext ctx) { - LOG_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); LoginServerThread.getInstance().sendLogout(getAccountName()); IdFactory.getInstance().releaseId(getObjectId()); @@ -339,7 +339,7 @@ public final class L2GameClient extends ChannelInboundHandler } } - LOG_ACCOUNTING.info("Delete, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Delete, " + objectId + ", " + this); return CharacterDeleteFailType.NONE; } @@ -362,7 +362,7 @@ public final class L2GameClient extends ChannelInboundHandler LOGGER.log(Level.SEVERE, "Error restoring character.", e); } - LOG_ACCOUNTING.info("Restore, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Restore, " + objectId + ", " + this); } public static void deleteCharByObjId(int objid) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/NpcStringId.java index cb4ea33b8f..27e222a09e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/NpcStringId.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { - private static final Logger _log = Logger.getLogger(NpcStringId.class.getName()); + private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; private static Map VALUES = new HashMap<>(); @@ -36253,7 +36253,7 @@ public final class NpcStringId } catch (Exception e) { - _log.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); + LOGGER.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Action.java index f92d2c5e23..6c3399eea7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Action.java @@ -154,7 +154,7 @@ public final class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - _log.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); + LOGGER.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 3159a555e3..1ffd75d20c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -58,7 +58,7 @@ public final class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - _log.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +68,7 @@ public final class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - _log.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 2471b37509..969aea0360 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.util.Util; @SuppressWarnings("unused") public final class CharacterCreate implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cSdddddddddddd private String _name; @@ -124,7 +124,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - _log.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -132,7 +132,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - _log.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -140,7 +140,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairColor > 3) || (_hairColor < 0)) { - _log.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -252,7 +252,7 @@ public final class CharacterCreate implements IClientIncomingPacket initNewChar(client, newChar); - LOG_ACCOUNTING.info("Created new character, " + newChar + ", " + client); + LOGGER_ACCOUNTING.info("Created new character, " + newChar + ", " + client); } private static boolean isValidName(String text) @@ -308,7 +308,7 @@ public final class CharacterCreate implements IClientIncomingPacket final L2ItemInstance item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - _log.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index cd62eefdba..1dab2d81f8 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -75,7 +75,7 @@ public final class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error:", e); + LOGGER.log(Level.SEVERE, "Error:", e); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index c7b59f3d6d..3d0b8dfcb3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ServerClose; */ public class CharacterSelect implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cd private int _charSlot; @@ -175,7 +175,7 @@ public class CharacterSelect implements IClientIncomingPacket client.getActiveCharLock().unlock(); } - LOG_ACCOUNTING.info("Logged in, " + client); + LOGGER_ACCOUNTING.info("Logged in, " + client); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5c18755798..689f42e143 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public final class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = activeChar.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - _log.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } activeChar.stopMovie(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6c6b755605..040487891b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -142,7 +142,7 @@ public class EnterWorld implements IClientIncomingPacket final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { - _log.warning("EnterWorld failed! activeChar returned 'null'."); + LOGGER.warning("EnterWorld failed! activeChar returned 'null'."); Disconnection.of(client).defaultSequence(false); return; } @@ -173,7 +173,7 @@ public class EnterWorld implements IClientIncomingPacket // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) // { - // _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); + // LOGGER.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); // } if (Config.PVP_COLOR_SYSTEM_ENABLED && !Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 29a07243b9..7638c7332e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -43,9 +43,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("[T1:ExGetOnAirShip] x: " + _x); - _log.info("[T1:ExGetOnAirShip] y: " + _y); - _log.info("[T1:ExGetOnAirShip] z: " + _z); - _log.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + 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); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index 4f62846be3..c9f4c0b539 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index 472f1051b3..b0f55887ee 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -27,5 +27,5 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger _log = Logger.getLogger(IClientIncomingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java index 8b2f68f220..d29291657e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class Logout implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -55,7 +55,7 @@ public final class Logout implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 3a681a986e..e3a9140189 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -147,7 +147,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - _log.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -155,14 +155,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) { - _log.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - _log.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -190,7 +190,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - _log.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -355,7 +355,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -453,7 +453,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -616,7 +616,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c9e6a88cec..6d400a1191 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.KeyPacket; */ public final class ProtocolVersion implements IClientIncomingPacket { - private static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + private static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private int _version; @@ -51,7 +51,7 @@ public final class ProtocolVersion implements IClientIncomingPacket } else if (!Config.PROTOCOL_LIST.contains(_version)) { - LOG_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); + LOGGER_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); client.setProtocolOk(false); client.close(new KeyPacket(client.enableCrypt(), 0)); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a00277486a..9990a21411 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -106,7 +106,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 32000)) { Util.handleIllegalPlayerAction(activeChar, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - _log.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); return; } @@ -125,7 +125,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - _log.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -135,7 +135,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); return; } @@ -517,7 +517,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } default: { - _log.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index daaae05884..4feb5ae11d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -56,7 +56,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -80,7 +80,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - _log.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } @@ -90,11 +90,11 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); } else if (prevSkillLevel != (_level - 1)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index baddc853ee..b54bca60ed 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -93,7 +93,7 @@ public final class RequestActionUse implements IClientIncomingPacket if (!(Arrays.binarySearch(allowedActions, _actionId) >= 0)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); + LOGGER.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); return; } } @@ -143,7 +143,7 @@ public final class RequestActionUse implements IClientIncomingPacket } default: { - _log.warning(activeChar.getName() + ": unhandled action type " + _actionId); + LOGGER.warning(activeChar.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 01c8b0c67f..138c70f9d8 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -131,7 +131,7 @@ public final class RequestBlock implements IClientIncomingPacket } default: { - _log.info("Unknown 0xA9 block type: " + _type); + LOGGER.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 6f572174ad..d67b7b4d1c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -161,7 +161,7 @@ public final class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - _log.warning("ERROR, no price found .. wrong buylist ??"); + LOGGER.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index a85b1019cc..7621a7029e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -86,7 +86,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty bypass!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty bypass!"); Disconnection.of(client, activeChar).defaultSequence(false); return; } @@ -107,7 +107,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket bypassOriginId = activeChar.validateHtmlAction(_command); if (bypassOriginId == -1) { - _log.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); + LOGGER.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); return; } @@ -192,7 +192,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); } } else if (_command.startsWith("_match")) @@ -285,13 +285,13 @@ public final class RequestBypassToServer implements IClientIncomingPacket } else { - _log.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - _log.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); + LOGGER.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); if (activeChar.isGM()) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 8d17f67975..61b88962de 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -61,7 +61,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket if (activeChar == null) { - _log.finer("RequestCrystalizeItem: activeChar was null"); + LOGGER.finer("RequestCrystalizeItem: activeChar was null"); return; } @@ -90,7 +90,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((activeChar.getRace() != Race.DWARF) && (activeChar.getClassId().ordinal() != 117) && (activeChar.getClassId().ordinal() != 55)) { - _log.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); + LOGGER.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); } return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index f48efc3a6d..9805ae3e39 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -171,7 +171,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not delete pet objectid: ", e); + LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 2c89d4fd7e..33c87254a1 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -185,7 +185,7 @@ public final class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - _log.warning(msg); + LOGGER.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index ac44a0a77b..2bbdb8626a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -42,6 +42,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 27e73c4de3..94fc6eac8a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -74,7 +74,7 @@ public final class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - _log.warning("Wrong Cube Game Team ID: " + _team); + LOGGER.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index ca230610ed..ea96e75807 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -64,7 +64,7 @@ public final class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - _log.warning("Unknown Cube Game Answer ID: " + _answer); + LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index 2aac09d8a2..87679b1211 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -34,6 +34,6 @@ public final class RequestExFishRanking implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestExFishRanking"); + LOGGER.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 1690c6d2f0..412be1caa7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -87,7 +87,7 @@ public final class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 31e55b54f3..0937ce580d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -72,7 +72,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - _log.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 352bc99c12..c031e965ea 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -43,7 +43,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - _log.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); + LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); if (client.getActiveChar() == null) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index 8c3b8157b7..d480f5057e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -44,6 +44,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - _log.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + LOGGER.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index ffc9040acd..0feb646e91 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -79,7 +79,7 @@ public final class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index ee5433c9e0..186e2f91a4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -119,7 +119,7 @@ public final class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 431f1db994..0f0b002fed 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -72,7 +72,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 4055e9b188..016c2378d4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -52,7 +52,7 @@ public final class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - _log.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); } client.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 6950da9b0c..a9704d4032 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -50,7 +50,7 @@ public final class RequestHennaItemRemoveInfo implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 0e427d5138..7c62b7cd89 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -75,7 +75,7 @@ public final class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - _log.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); + LOGGER.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); client.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index d8a598fa60..53afe57b35 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -49,20 +49,20 @@ public final class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - _log.warning("Player " + actor.getName() + " sent empty html link!"); + LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - _log.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - _log.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 3d797b889a..c8a621359f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -50,7 +50,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (activeChar.getObjectId() != _objectId) { - _log.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + LOGGER.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 1f6b539929..cab42128f7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public final class RequestMagicSkillUse implements IClientIncomingPacket activeChar.sendPacket(ActionFailed.STATIC_PACKET); if (_magicId > 0) { - _log.warning("Skill Id " + _magicId + " not found in player: " + activeChar); + LOGGER.warning("Skill Id " + _magicId + " not found in player: " + activeChar); } return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 0ab61c25b8..11ed417b33 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -72,7 +72,7 @@ public final class RequestOustPledgeMember implements IClientIncomingPacket final L2ClanMember member = clan.getClanMember(_target); if (member == null) { - _log.warning("Target (" + _target + ") is not member of the clan"); + LOGGER.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayerInstance().isInCombat()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index b703480e20..b87741c610 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -37,6 +37,6 @@ public final class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestPCCafeCouponUse: S: " + _str); + LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index aa71b73eb6..05962263f7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -119,7 +119,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -168,7 +168,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -176,7 +176,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 9ef482c27c..57d27eec76 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -136,7 +136,7 @@ public final class RequestPetUseItem implements IClientIncomingPacket else { activeChar.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - _log.warning("No item handler registered for itemId: " + item.getId()); + LOGGER.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index deef71c1ba..29ab10a108 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -74,7 +74,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - _log.severe("Error while saving petition feedback"); + LOGGER.severe("Error while saving petition feedback"); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 7e97a40c3f..432d30d9aa 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -74,7 +74,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -153,7 +153,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket final L2MerchantInstance merchant = (target instanceof L2MerchantInstance) ? (L2MerchantInstance) target : null; if (merchant == null) { - _log.warning("Null merchant!"); + LOGGER.warning("Null merchant!"); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index b6f2892f96..a20bb3d197 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -160,7 +160,7 @@ public final class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - _log.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 536446bb1d..7406f63592 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -138,7 +138,7 @@ public final class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9ab82245e8..01373d760d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -194,7 +194,7 @@ public final class RequestRefundItem implements IClientIncomingPacket final L2ItemInstance item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - _log.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); continue; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 8b253257c5..1a4ea38608 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack } else { - _log.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } activeChar.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 23c4edd13c..f8749dfd8b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class RequestRestart implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -58,7 +58,7 @@ public final class RequestRestart implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 7ba8a189b4..e08c984b59 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -91,7 +91,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else if (!activeChar.isDead()) { - _log.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); + LOGGER.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); return; } @@ -143,7 +143,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getHideoutId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CLANHALL); @@ -171,7 +171,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -194,7 +194,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getFortId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.FORTRESS); @@ -223,7 +223,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.SIEGEFLAG); @@ -233,7 +233,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if (!activeChar.isGM() && !activeChar.getInventory().haveItemForSelfResurrection()) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (activeChar.isGM() || activeChar.destroyItemByItemId("Feather", 10649, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13300, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13128, 1, activeChar, false)) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9cbb114e88..e53df987df 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -323,14 +323,14 @@ public final class RequestSendPost implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - _log.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final L2ItemInstance newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - _log.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 092a91fe40..5e2215c60a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -54,17 +54,17 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((activeChar == null) || (castle == null)) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != activeChar.getClanId())) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); return; } else if (!activeChar.isClanLeader()) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); return; } else if (!castle.getIsTimeRegistrationOver()) @@ -81,12 +81,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index 5ab9bf7732..220b673807 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -109,7 +109,7 @@ public final class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - _log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); + LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -117,7 +117,7 @@ public final class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - _log.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); + LOGGER.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -224,7 +224,7 @@ public final class Say2 implements IClientIncomingPacket } else { - _log.info("No handler registered for ChatType: " + _type + " Player: " + client); + LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -271,7 +271,7 @@ public final class Say2 implements IClientIncomingPacket if (item == null) { - _log.info(client + " trying publish item which doesnt own! ID:" + id); + LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -279,7 +279,7 @@ public final class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - _log.info(client + " sent invalid publish item msg! ID:" + id); + LOGGER.info(client + " sent invalid publish item msg! ID:" + id); return false; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 84eccf9f7a..2255ca3502 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -67,14 +67,14 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket activeChar.sendMessage("The command " + command.substring(6) + " does not exists!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 60c0402b18..237686ac3b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -128,7 +128,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -175,7 +175,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -187,7 +187,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 9c76eb1086..dc8836ed4b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -167,13 +167,13 @@ public final class SendWareHouseWithDrawList implements IClientIncomingPacket final L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final L2ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java index 5999d7d02c..8ae98bd315 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -272,7 +272,7 @@ public final class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(activeChar, item, _ctrlPressed)) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java index 1441d46716..622d6d2d7f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java @@ -64,8 +64,8 @@ public class ValidatePosition implements IClientIncomingPacket if (Config.DEVELOPER) { - _log.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); - _log.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); + LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); + LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); } if ((_x == 0) && (_y == 0)) @@ -191,7 +191,7 @@ public class ValidatePosition implements IClientIncomingPacket { if (Config.DEVELOPER) { - _log.info(activeChar.getName() + ": Synchronizing position Server --> Client"); + LOGGER.info(activeChar.getName() + ": Synchronizing position Server --> Client"); } activeChar.sendPacket(new ValidateLocation(activeChar)); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 95cfb7da92..0e6644de0b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -57,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - _log.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - _log.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((activeChar.getAbilityPoints() == 0) || (activeChar.getAbilityPoints() == activeChar.getAbilityPointsUsed())) { - _log.warning("Player " + activeChar + " is trying to learn ability without ability points!"); + LOGGER.warning("Player " + activeChar + " is trying to learn ability without ability points!"); return; } @@ -115,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final L2SkillLearn learn = SkillTreesData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - _log.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -123,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - _log.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - _log.warning("Player " + activeChar + " is trying to learn " + skill + " without enough ability points spent!"); + LOGGER.warning("Player " + activeChar + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (activeChar.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - _log.warning("Player " + activeChar + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + LOGGER.warning("Player " + activeChar + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((activeChar.getAbilityPoints() - activeChar.getAbilityPointsUsed()) < points) { - _log.warning("Player " + activeChar + " is trying to learn ability without ability points!"); + LOGGER.warning("Player " + activeChar + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 414e817ffe..fde25d4736 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -95,7 +95,7 @@ public class RequestAlchemyConversion implements IClientIncomingPacket final AlchemyCraftData data = AlchemyData.getInstance().getCraftData(_skillId, _skillLevel); if (data == null) { - _log.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 8cf9b2f3b5..8cf139d7c4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -57,7 +57,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_durationType < 0) || (_durationType > 3)) { - _log.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 659b237448..5e0ad65f1a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -101,7 +101,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning(activeChar + ": tried to crystallize " + item.getItem()); + LOGGER.warning(activeChar + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 076d40a420..a2d7c3bba4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -102,7 +102,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); } } else diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index faeca65fce..03435f7f4d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -101,7 +101,7 @@ public final class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not del friend objectid: ", e); + LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 29a252aa5e..94715a15c1 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -94,7 +94,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index c51d4f158a..de2ad9cf73 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -77,7 +77,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - _log.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index a7553a343f..5d89208157 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -61,7 +61,7 @@ public final class RequestBRProductList implements IClientIncomingPacket } default: { - _log.warning(player + " send unhandled product list type: " + _type); + LOGGER.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index 50b48de960..7c1b5ab107 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -71,7 +71,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { activeChar.sendMessage("That zone is not supported yet!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); return; } @@ -79,7 +79,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { activeChar.sendMessage("This zone is not handled yet!!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index 4c9c106a52..b6ac83ea82 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -60,7 +60,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket activeChar.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - _log.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); + LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java index eb24a578fb..9d28cd837c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java @@ -29,7 +29,7 @@ import com.l2jmobius.commons.network.BaseSendablePacket; */ public class BlowFishKey extends BaseSendablePacket { - private static Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param blowfishKey @@ -48,7 +48,7 @@ public class BlowFishKey extends BaseSendablePacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index d7f5a56cb6..4b509229e8 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -75,7 +75,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - _log.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); _html = html.substring(0, 17200); } @@ -93,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - _log.warning("missing html page " + path); + LOGGER.warning("missing html page " + path); return false; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 16c17c043b..a06dff5ebc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -134,7 +134,7 @@ public abstract class AbstractMessagePacket> // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - _log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 754045823b..59f3871e39 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { - private static Logger _log = Logger.getLogger(CharSelectionInfo.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); private final String _loginName; private final int _sessionId; private int _activeId; @@ -240,7 +240,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } return new CharSelectInfoPackage[0]; } @@ -265,7 +265,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); } } @@ -377,7 +377,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 36ef7cd289..1c046a085c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -46,7 +46,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 03c64d3f83..a90b288eb1 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -44,7 +44,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 0616962b58..6cedcdd459 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -55,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - _log.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + LOGGER.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_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 8b2fe9aa5e..ba2ae9f9f1 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger _log = Logger.getLogger(IClientOutgoingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); int[] PAPERDOLL_ORDER = new int[] { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index f21611bb50..d0f43d0ffe 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -56,7 +56,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - _log.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 6397e049ac..401b7e072c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -58,7 +58,7 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - _log.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); + LOGGER.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 44a9997fb2..562b2ccd31 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -78,7 +78,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - _log.warning("Null owner for castle: " + _castle.getName()); + LOGGER.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 1082f31974..77c787e1be 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -55,7 +55,7 @@ public final class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_activeChar.getActiveWarehouse() == null) { - _log.warning("error while sending withdraw request to: " + _activeChar.getName()); + LOGGER.warning("error while sending withdraw request to: " + _activeChar.getName()); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/DateRange.java index 3b8acae352..1a16f0bd49 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/DateRange.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; */ public class DateRange { - protected static final Logger _log = Logger.getLogger(DateRange.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(DateRange.class.getName()); private final Date _startDate, _endDate; public DateRange(Date from, Date to) @@ -47,7 +47,7 @@ public class DateRange } catch (ParseException e) { - _log.log(Level.WARNING, "Invalid Date Format.", e); + LOGGER.log(Level.WARNING, "Invalid Date Format.", e); } } return new DateRange(null, null); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/ScriptDocument.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/ScriptDocument.java index eacfe5baf8..672c90e094 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/ScriptDocument.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/ScriptDocument.java @@ -33,7 +33,7 @@ import org.xml.sax.SAXException; */ public class ScriptDocument { - private static final Logger _log = Logger.getLogger(ScriptDocument.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScriptDocument.class.getName()); private Document _document; private final String _name; @@ -57,17 +57,17 @@ public class ScriptDocument { x = sxe.getException(); } - _log.warning(getClass().getSimpleName() + ": " + x.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + x.getMessage()); } catch (ParserConfigurationException pce) { // Parser with specified options can't be built - _log.log(Level.WARNING, "", pce); + LOGGER.log(Level.WARNING, "", pce); } catch (IOException ioe) { // I/O error - _log.log(Level.WARNING, "", ioe); + LOGGER.log(Level.WARNING, "", ioe); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 1779779829..8344576a3e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SecondaryPasswordAuth { - private final Logger _log = Logger.getLogger(SecondaryPasswordAuth.class.getName()); + private final Logger LOGGER = Logger.getLogger(SecondaryPasswordAuth.class.getName()); private final L2GameClient _activeClient; private String _password; @@ -96,7 +96,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); } } @@ -104,7 +104,7 @@ public class SecondaryPasswordAuth { if (passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -127,7 +127,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing password.", e); + LOGGER.log(Level.SEVERE, "Error while writing password.", e); return false; } _password = password; @@ -147,7 +147,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing wrong attempts.", e); + LOGGER.log(Level.SEVERE, "Error while writing wrong attempts.", e); return false; } return true; @@ -157,7 +157,7 @@ public class SecondaryPasswordAuth { if (!passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -185,7 +185,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); return false; } @@ -210,7 +210,7 @@ public class SecondaryPasswordAuth { LoginServerThread.getInstance().sendTempBan(_activeClient.getAccountName(), _activeClient.getConnectionAddress().getHostAddress(), SecondaryAuthData.getInstance().getBanTime()); LoginServerThread.getInstance().sendMail(_activeClient.getAccountName(), "SATempBan", _activeClient.getConnectionAddress().getHostAddress(), Integer.toString(SecondaryAuthData.getInstance().getMaxAttempts()), Long.toString(SecondaryAuthData.getInstance().getBanTime()), SecondaryAuthData.getInstance().getRecoveryLink()); - _log.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); + LOGGER.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); insertWrongAttempt(0); _activeClient.close(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_BAN, SecondaryAuthData.getInstance().getMaxAttempts())); } @@ -258,11 +258,11 @@ public class SecondaryPasswordAuth } catch (NoSuchAlgorithmException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); } catch (UnsupportedEncodingException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Encoding"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Encoding"); } return null; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index 9f26c91ac6..49f8a70c08 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; */ public class AttackStanceTaskManager { - protected static final Logger _log = Logger.getLogger(AttackStanceTaskManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AttackStanceTaskManager.class.getName()); protected static final Map _attackStanceTasks = new ConcurrentHashMap<>(); @@ -132,7 +132,7 @@ public class AttackStanceTaskManager catch (Exception e) { // Unless caught here, players remain in attack positions. - _log.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Broadcast.java index 419eb6295a..dfaa95d5d0 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Broadcast.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.RelationChanged; */ public final class Broadcast { - private static Logger _log = Logger.getLogger(Broadcast.class.getName()); + private static Logger LOGGER = Logger.getLogger(Broadcast.class.getName()); /** * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character that have the Character targeted.
@@ -101,7 +101,7 @@ public final class Broadcast } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } }); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Evolve.java index 7fae394d24..66a22f62fd 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/Evolve.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class Evolve { - protected static final Logger _log = Logger.getLogger(Evolve.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Evolve.class.getName()); public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) { @@ -287,7 +287,7 @@ public final class Evolve } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } @@ -314,7 +314,7 @@ public final class Evolve } catch (Throwable e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java index f005fca2ea..7c4f9c2185 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -40,7 +40,7 @@ public final class FloodProtectorAction /** * Logger */ - private static final Logger _log = Logger.getLogger(FloodProtectorAction.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectorAction.class.getName()); /** * Client for this instance of flood protector. */ @@ -94,7 +94,7 @@ public final class FloodProtectorAction if ((curTick < _nextGameTick) || _punishmentInProgress) { - if (_config.LOG_FLOODING && !_logged && _log.isLoggable(Level.WARNING)) + if (_config.LOG_FLOODING && !_logged && LOGGER.isLoggable(Level.WARNING)) { log(" called command ", command, " ~", String.valueOf((_config.FLOOD_PROTECTION_INTERVAL - (_nextGameTick - curTick)) * GameTimeController.MILLIS_IN_TICK), " ms after previous command"); _logged = true; @@ -124,7 +124,7 @@ public final class FloodProtectorAction return false; } - if ((_count.get() > 0) && _config.LOG_FLOODING && _log.isLoggable(Level.WARNING)) + if ((_count.get() > 0) && _config.LOG_FLOODING && LOGGER.isLoggable(Level.WARNING)) { log(" issued ", String.valueOf(_count), " extra requests within ~", String.valueOf(_config.FLOOD_PROTECTION_INTERVAL * GameTimeController.MILLIS_IN_TICK), " ms"); } @@ -142,7 +142,7 @@ public final class FloodProtectorAction { Disconnection.of(_client).defaultSequence(false); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log("kicked for flooding"); } @@ -154,7 +154,7 @@ public final class FloodProtectorAction private void banAccount() { PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -176,7 +176,7 @@ public final class FloodProtectorAction PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" jailed for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -238,6 +238,6 @@ public final class FloodProtectorAction Arrays.stream(lines).forEach(output::append); - _log.warning(output.toString()); + LOGGER.warning(output.toString()); } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/GMAudit.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/GMAudit.java index c2ee25069b..c2a5593953 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/GMAudit.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/GMAudit.java @@ -31,7 +31,7 @@ import com.l2jmobius.Config; */ public class GMAudit { - private static final Logger _log = Logger.getLogger(GMAudit.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GMAudit.class.getName()); static { new File("log/GMAudit").mkdirs(); @@ -61,7 +61,7 @@ public class GMAudit } catch (IOException e) { - _log.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); + LOGGER.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 7394f489e8..ecc40e644b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public final class OfflineTradeUtil { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private OfflineTradeUtil() { @@ -145,7 +145,7 @@ public final class OfflineTradeUtil } Disconnection.of(player).storeMe().close(false); - LOG_ACCOUNTING.info("Entering offline mode, " + client); + LOGGER_ACCOUNTING.info("Entering offline mode, " + client); return true; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/FloodProtectedListener.java index df39b38769..d046a0f65c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import com.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger _log = Logger.getLogger(FloodProtectedListener.class.getName()); + private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map _floodProtection = new ConcurrentHashMap<>(); private ServerSocket _serverSocket; @@ -70,7 +70,7 @@ public abstract class FloodProtectedListener extends Thread fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) { - _log.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); + LOGGER.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); } fConnection.isFlooding = true; continue; @@ -78,7 +78,7 @@ public abstract class FloodProtectedListener extends Thread if (fConnection.isFlooding) // if connection was flooding server but now passed the check { fConnection.isFlooding = false; - _log.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); + LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } fConnection.lastConnection = System.currentTimeMillis(); } @@ -102,7 +102,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException io) { - _log.log(Level.INFO, "", io); + LOGGER.log(Level.INFO, "", io); } break; } @@ -145,7 +145,7 @@ public abstract class FloodProtectedListener extends Thread } else { - _log.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); + LOGGER.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); } } @@ -157,7 +157,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java index 767e0b2326..78eadc9019 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters; */ public class GameServerThread extends Thread { - protected static final Logger _log = Logger.getLogger(GameServerThread.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GameServerThread.class.getName()); private final Socket _connection; private InputStream _in; private OutputStream _out; @@ -69,7 +69,7 @@ public class GameServerThread extends Thread _connectionIPAddress = _connection.getInetAddress().getHostAddress(); if (GameServerThread.isBannedGameserverIP(_connectionIPAddress)) { - _log.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); + LOGGER.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); forceClose(LoginServerFail.REASON_IP_BANNED); // ensure no further processing for this connection return; @@ -92,7 +92,7 @@ public class GameServerThread extends Thread if ((lengthHi < 0) || _connection.isClosed()) { - _log.finer("LoginServerThread: Login terminated the connection."); + LOGGER.finer("LoginServerThread: Login terminated the connection."); break; } @@ -110,7 +110,7 @@ public class GameServerThread extends Thread if (receivedBytes != (length - 2)) { - _log.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); + LOGGER.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); break; } @@ -119,7 +119,7 @@ public class GameServerThread extends Thread checksumOk = NewCrypt.verifyChecksum(data); if (!checksumOk) { - _log.warning("Incorrect packet checksum, closing connection (LS)"); + LOGGER.warning("Incorrect packet checksum, closing connection (LS)"); return; } @@ -130,14 +130,14 @@ public class GameServerThread extends Thread { final String serverName = getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"; final String msg = "GameServer " + serverName + ": Connection lost: " + e.getMessage(); - _log.info(msg); + LOGGER.info(msg); } finally { if (isAuthed()) { _gsi.setDown(); - _log.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); + LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); @@ -185,7 +185,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); + LOGGER.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); } } @@ -209,7 +209,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final ScrambledKeyPair pair = LoginController.getInstance().getScrambledRSAKeyPair(); _privateKey = (RSAPrivateKey) pair.getPrivateKey(); @@ -241,7 +241,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.severe("IOException while sending packet " + sl.getClass().getSimpleName()); + LOGGER.severe("IOException while sending packet " + sl.getClass().getSimpleName()); } } @@ -265,7 +265,7 @@ public class GameServerThread extends Thread */ public void setGameHosts(String[] hosts) { - _log.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); + LOGGER.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); _gsi.clearServerAddresses(); for (int i = 0; i < hosts.length; i += 2) @@ -276,13 +276,13 @@ public class GameServerThread extends Thread } catch (Exception e) { - _log.warning("Couldn't resolve hostname \"" + e + "\""); + LOGGER.warning("Couldn't resolve hostname \"" + e + "\""); } } for (String s : _gsi.getServerAddresses()) { - _log.info(s); + LOGGER.info(s); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/L2LoginServer.java index bad76dd97c..b87afbb356 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/L2LoginServer.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; */ public final class L2LoginServer { - private final Logger _log = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; private static L2LoginServer _instance; @@ -77,7 +77,7 @@ public final class L2LoginServer } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Load Config @@ -92,7 +92,7 @@ public final class L2LoginServer } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); System.exit(1); } @@ -104,11 +104,11 @@ public final class L2LoginServer { _gameServerListener = new GameServerListener(); _gameServerListener.start(); - _log.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); + LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); } catch (IOException e) { - _log.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); System.exit(1); } @@ -148,7 +148,7 @@ public final class L2LoginServer } catch (NumberFormatException nfe) { - _log.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); return; } } @@ -159,25 +159,25 @@ public final class L2LoginServer } catch (UnknownHostException e) { - _log.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); } }); //@formatter:on } catch (IOException e) { - _log.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); } - _log.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); + LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); } else { - _log.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); + LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); } if (Config.LOGIN_SERVER_SCHEDULE_RESTART) { - _log.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); + LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); _restartLoginServer = new LoginServerRestart(); _restartLoginServer.setDaemon(true); _restartLoginServer.start(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/LoginController.java index ff547092da..a896c7fd7a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/LoginController.java @@ -51,7 +51,7 @@ import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason public class LoginController { - protected static final Logger _log = Logger.getLogger(LoginController.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(LoginController.class.getName()); private static LoginController _instance; @@ -78,7 +78,7 @@ public class LoginController private LoginController() throws GeneralSecurityException { - _log.info("Loading LoginController..."); + LOGGER.info("Loading LoginController..."); _keyPairs = new ScrambledKeyPair[10]; _blowfishKeyGenerator = KeyGenerator.getInstance("Blowfish"); @@ -91,7 +91,7 @@ public class LoginController _keyPairs[i] = new ScrambledKeyPair(rsaKeyPairGenerator.generateKeyPair()); } - _log.info("Cached 10 KeyPairs for RSA communication."); + LOGGER.info("Cached 10 KeyPairs for RSA communication."); final Thread purge = new PurgeThread(); purge.setDaemon(true); @@ -156,7 +156,7 @@ public class LoginController addBanForAddress(addr, Config.LOGIN_BLOCK_AFTER_BAN * 1000); // we need to clear the failed login attempts here, so after the ip ban is over the client has another 5 attempts clearFailedLoginAttemps(addr); - _log.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); + LOGGER.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); } } @@ -218,16 +218,16 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); return null; } - _log.info("Auto created account '" + login + "'."); + LOGGER.info("Auto created account '" + login + "'."); return retriveAccountInfo(addr, login, password, false); } catch (Exception e) { - _log.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); return null; } } @@ -301,7 +301,7 @@ public class LoginController if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); - _log.info("Removed expired ip address ban " + address.getHostAddress() + "."); + LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); return false; } return true; @@ -414,7 +414,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); } } return loginOk; @@ -433,7 +433,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); } } @@ -452,7 +452,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); } } @@ -532,13 +532,13 @@ public class LoginController { if (!ipWhiteList.isEmpty() && !ipWhiteList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); return false; } if (!ipBlackList.isEmpty() && ipBlackList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); return false; } } @@ -558,7 +558,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not finish login process!", e); + LOGGER.log(Level.WARNING, "Could not finish login process!", e); return false; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java index 83ad61827b..bfa7e9dc02 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class L2JGameServerPacketHandler { - protected static Logger _log = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); + protected static Logger LOGGER = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); public enum GameServerState { @@ -65,7 +65,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -83,7 +83,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -146,7 +146,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2LoginClient.java index c4f45ea59b..da20164f21 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -46,7 +46,7 @@ import io.netty.channel.ChannelHandlerContext; */ public final class L2LoginClient extends ChannelInboundHandler { - private static final Logger _log = Logger.getLogger(L2LoginClient.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2LoginClient.class.getName()); // Crypt private final ScrambledKeyPair _scrambledPair; @@ -105,7 +105,7 @@ public final class L2LoginClient extends ChannelInboundHandler } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java index 60d7ed1647..2172a0ef38 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java @@ -46,7 +46,7 @@ import com.l2jmobius.loginserver.network.serverpackets.ServerList; */ public class RequestAuthLogin implements IIncomingPacket { - private static Logger _log = Logger.getLogger(RequestAuthLogin.class.getName()); + private static Logger LOGGER = Logger.getLogger(RequestAuthLogin.class.getName()); private final byte[] _raw1 = new byte[128]; private final byte[] _raw2 = new byte[128]; @@ -89,7 +89,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (GeneralSecurityException e) { - _log.log(Level.INFO, "", e); + LOGGER.log(Level.INFO, "", e); return; } @@ -108,7 +108,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java index 6abfe18518..a68b2053a7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java @@ -32,7 +32,7 @@ import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerSt */ public class BlowFishKey extends BaseRecievePacket { - protected static final Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param decrypt @@ -67,7 +67,7 @@ public class BlowFishKey extends BaseRecievePacket } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java index 03ff8df8d3..4e0c492ffa 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java @@ -27,7 +27,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class ChangeAccessLevel extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangeAccessLevel.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangeAccessLevel.class.getName()); /** * @param decrypt @@ -40,6 +40,6 @@ public class ChangeAccessLevel extends BaseRecievePacket final String account = readS(); LoginController.getInstance().setAccountAccessLevel(account, level); - _log.info("Changed " + account + " access level to " + level); + LOGGER.info("Changed " + account + " access level to " + level); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java index d4c10be532..69ba99271d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java @@ -35,7 +35,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ChangePassword extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangePassword.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangePassword.class.getName()); private static GameServerThread gst = null; public ChangePassword(byte[] decrypt) @@ -103,7 +103,7 @@ public class ChangePassword extends BaseRecievePacket passUpdated = ps.executeUpdate(); } - _log.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); + LOGGER.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); if (passUpdated > 0) { gst.ChangePasswordResponse((byte) 1, characterName, "You have successfully changed your password!"); @@ -120,7 +120,7 @@ public class ChangePassword extends BaseRecievePacket } catch (Exception e) { - _log.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); + LOGGER.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java index 2154becbb5..153a4cd86d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class GameServerAuth extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(GameServerAuth.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GameServerAuth.class.getName()); GameServerThread _server; private final byte[] _hexId; private final int _desiredId; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java index 194d82d565..baa6528090 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerLogout extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerLogout.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerLogout.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java index 69c263628b..542848f6e6 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class PlayerTracert extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerTracert.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerTracert.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java index 1a76467686..f9a24a80d8 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java @@ -31,7 +31,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class RequestTempBan extends BaseRecievePacket { - private static final Logger _log = Logger.getLogger(RequestTempBan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RequestTempBan.class.getName()); private final String _accountName; @SuppressWarnings("unused") @@ -69,7 +69,7 @@ public class RequestTempBan extends BaseRecievePacket } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } try diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java index 6c7aed04d5..155d19688d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java @@ -28,7 +28,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ServerStatus extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ServerStatus.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ServerStatus.class.getName()); public static final int SERVER_LIST_STATUS = 0x01; public static final int SERVER_TYPE = 0x02; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java index cc2a6c0c2f..2a71996141 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -61,7 +61,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; */ public final class ServerList implements IOutgoingPacket { - protected static final Logger _log = Logger.getLogger(ServerList.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ServerList.class.getName()); private final List _servers; private final int _lastServer; @@ -89,7 +89,7 @@ public final class ServerList implements IOutgoingPacket } catch (UnknownHostException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); _ip = new byte[4]; _ip[0] = 127; _ip[1] = 0; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java index 593e01a15d..887e4f715c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; */ public class IPv4Filter implements Runnable { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final HashMap _ipFloodMap; private static final long SLEEP_TIME = 5000; @@ -69,7 +69,7 @@ public class IPv4Filter implements Runnable final InetAddress addr = sc.socket().getInetAddress(); if (!(addr instanceof Inet4Address)) { - _log.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); + LOGGER.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/AbstractNpcAI.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/AbstractNpcAI.java index 12e345f842..5647db4178 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/AbstractNpcAI.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/AbstractNpcAI.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class AbstractNpcAI extends Quest { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); public AbstractNpcAI() { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java index 1f8241ae42..d475493c5c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java @@ -76,7 +76,7 @@ public final class CrumaTower extends AbstractNpcAI } catch (Exception e) { - _log.warning("Invalid location for Cruma Tower teleport device."); + LOGGER.warning("Invalid location for Cruma Tower teleport device."); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java index b21c9b9df7..a1916fbe26 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java @@ -119,7 +119,7 @@ public final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - _log.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); + LOGGER.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); return null; } final int skillId = getSkillIdByNpcId(npc.getId()); @@ -144,7 +144,7 @@ public final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - _log.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); + LOGGER.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); return null; } final int skillId = getSkillIdByNpcId(npc.getId()); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 23514e5981..e86278e0e3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -135,7 +135,7 @@ public final class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000L; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000L, cycle); - _log.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index c56b9cd6e2..47ca8563c0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -303,7 +303,7 @@ public final class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - _log.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } @@ -368,7 +368,7 @@ public final class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - _log.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); return null; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java index 7fd192d114..fa11615bfe 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java @@ -199,7 +199,7 @@ public class EnchantedMegaliths extends AbstractNpcAI private void updateMegalithStage() { GlobalVariablesManager.getInstance().set(HB_MEGALITH_STAGE, stage); - _log.info("[Hellbound] - Enchanted Megaliths stage: " + stage); + LOGGER.info("[Hellbound] - Enchanted Megaliths stage: " + stage); switch (stage) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index e67e5ea74d..78377b5546 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -57,6 +58,8 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets; */ public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName()); + // NPCs private static final int CONQUEROR_MANAGER = 31921; private static final int EMPEROR_MANAGER = 31922; @@ -678,7 +681,7 @@ public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReade { ROOM_SPAWN_DATA.clear(); parseDatapackFile("data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.xml"); - _log.info("[Four Sepulchers] Loaded " + ROOM_SPAWN_DATA.size() + " spawn zones data."); + LOGGER.info("[Four Sepulchers] Loaded " + ROOM_SPAWN_DATA.size() + " spawn zones data."); } @Override diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index d0e679a7d6..e428ba8107 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -319,7 +319,7 @@ public final class Raina extends AbstractNpcAI if (cType == null) { - _log.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); + LOGGER.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); } final StringBuilder sb = new StringBuilder(); @@ -404,7 +404,7 @@ public final class Raina extends AbstractNpcAI if (cType == null) { - _log.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); + LOGGER.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); } final StringBuilder sb = new StringBuilder(); @@ -894,7 +894,7 @@ public final class Raina extends AbstractNpcAI final String text = getHtm(player.getHtmlPrefix(), fileName); if (text == null) { - _log.info("Cannot find HTML file for " + Raina.class.getSimpleName() + " AI: " + fileName); + LOGGER.info("Cannot find HTML file for " + Raina.class.getSimpleName() + " AI: " + fileName); return null; } html.setHtml(text); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 1f39611ed2..bd2ea79b44 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -628,7 +628,7 @@ public final class Antharas extends AbstractNpcAI { if (!zone.isCharacterInZone(attacker) || (getStatus() != IN_FIGHT)) { - _log.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); attacker.teleToLocation(80464, 152294, -3534); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 33344e3f16..ef75b87d78 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -271,12 +271,12 @@ public class Lindvior extends AbstractNpcAI if (!_zoneLair.isInsideZone(attacker)) { attacker.doDie(null); - _log.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " out of the boss zone!"); + LOGGER.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " out of the boss zone!"); } if (!_zoneLair.isInsideZone(npc)) { npc.teleToLocation(CENTER_LOCATION, true); - _log.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " wich is out of the boss zone!"); + LOGGER.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " wich is out of the boss zone!"); } double percent = ((npc.getCurrentHp() - damage) / npc.getMaxHp()) * 100; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index fbe2297935..ff6ffbd3a9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -314,7 +314,7 @@ public final class Sailren extends AbstractNpcAI { if (STATUS == Status.IN_FIGHT) { - _log.info(getClass().getSimpleName() + ": Script is being unloaded while Sailren is active, clearing zone."); + LOGGER.info(getClass().getSimpleName() + ": Script is being unloaded while Sailren is active, clearing zone."); notifyEvent("TIME_OUT", null, null); } return super.unload(removeFromList); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index 41c7968623..202e22b1f3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -67,6 +68,8 @@ import instances.AbstractInstance; */ public final class Stage1 extends AbstractInstance implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(Stage1.class.getName()); + protected static class SODSpawn { public boolean isZone = false; @@ -207,7 +210,7 @@ public final class Stage1 extends AbstractInstance implements IGameXmlReader public void load() { parseDatapackFile("data/scripts/ai/bosses/Tiat/SeedOfDestruction.xml"); - _log.info("[Seed of Destruction] Loaded " + _spawnZoneList.size() + " spawn zones data."); + LOGGER.info("[Seed of Destruction] Loaded " + _spawnZoneList.size() + " spawn zones data."); } @Override @@ -346,7 +349,7 @@ public final class Stage1 extends AbstractInstance implements IGameXmlReader } else { - _log.info("[Seed of Destruction] Missing zone: " + spw.zone); + LOGGER.info("[Seed of Destruction] Missing zone: " + spw.zone); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java index 1fc5df6996..92ef8f9f25 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java @@ -150,7 +150,7 @@ public final class CastleAmbassador extends AbstractNpcAI if (fort == null) { npc.deleteMe(); - _log.warning("Spawned: " + npc + " location: " + npc.getLocation() + " without fort!"); + LOGGER.warning("Spawned: " + npc + " location: " + npc.getLocation() + " without fort!"); return null; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 45780446af..509ac8cb3d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1245,7 +1245,7 @@ public final class CastleChamberlain extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index 749f577141..e0f4f546e6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public final class ManorManager extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 9e65f90f3a..dc61f5b704 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -73,7 +73,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler "watchmatch", "arenachange" }; - private static final Logger _LOG = Logger.getLogger(OlyManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlyManager.class.getName()); private OlyManager() { @@ -364,7 +364,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler final List spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns(); if (spectatorSpawns.isEmpty()) { - _LOG.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); + LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); @@ -375,7 +375,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler } catch (Exception e) { - _LOG.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 4ca3d1df97..813358bd0c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -88,7 +88,7 @@ public final class Elpies extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started because custom NPC table is disabled!"); + LOGGER.info(getName() + ": Event can't be started because custom NPC table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index e8d253c2c9..bd418adefc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -95,7 +95,7 @@ public final class Rabbits extends Event // Check starting conditions if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPCs are disabled!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java index 19f2f42bae..7756d0d55e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java @@ -121,7 +121,7 @@ public final class Race extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom npc table is disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom npc table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/listeners/ListenerTest.java index 73b858e854..59dcb31683 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -63,7 +63,7 @@ public class ListenerTest extends AbstractNpcAI // Manual listener registration Containers.Global().addListener(new ConsumerEventListener(Containers.Global(), EventType.ON_PLAYER_DLG_ANSWER, (OnPlayerDlgAnswer event) -> { - _log.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); }, this)); } @@ -73,7 +73,7 @@ public class ListenerTest extends AbstractNpcAI */ private void onAttackableAttack(OnAttackableAttack event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); } /** @@ -88,7 +88,7 @@ public class ListenerTest extends AbstractNpcAI @Id(22228) private void onCreatureKill(OnCreatureDeath event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); } /** @@ -101,7 +101,7 @@ public class ListenerTest extends AbstractNpcAI @Range(from = 1, to = 9) private void onSiegeStart(OnCastleSiegeStart event) { - _log.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); + LOGGER.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); } /** @@ -114,7 +114,7 @@ public class ListenerTest extends AbstractNpcAI @Id(5575) private void onItemCreate(OnItemCreate event) { - _log.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); + LOGGER.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); } /** @@ -152,7 +152,7 @@ public class ListenerTest extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void OnPlayerLogin(OnPlayerLogin event) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); } /** @@ -170,7 +170,7 @@ public class ListenerTest extends AbstractNpcAI { if (event.getTarget().isGM()) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); return new TerminateReturn(true, true, true); } return null; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java index 15619c6ee5..8ff587ff17 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java @@ -341,7 +341,7 @@ import handlers.voicedcommandhandlers.StatsVCmd; */ public class MasterHandler { - private static final Logger _log = Logger.getLogger(MasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MasterHandler.class.getName()); private static final IHandler[] LOAD_INSTANCES = { @@ -680,7 +680,7 @@ public class MasterHandler public static void main(String[] args) { - _log.info("Loading Handlers..."); + LOGGER.info("Loading Handlers..."); final Map, Method> registerHandlerMethods = new HashMap<>(); for (IHandler loadInstance : LOAD_INSTANCES) @@ -697,7 +697,7 @@ public class MasterHandler registerHandlerMethods.entrySet().stream().filter(e -> e.getValue() == null).forEach(e -> { - _log.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); + LOGGER.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); }); for (Class classes[] : HANDLERS) @@ -722,7 +722,7 @@ public class MasterHandler } catch (Exception e) { - _log.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); + LOGGER.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); continue; } } @@ -759,9 +759,9 @@ public class MasterHandler for (IHandler loadInstance : LOAD_INSTANCES) { - _log.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); + LOGGER.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); } - _log.info("Handlers Loaded..."); + LOGGER.info("Handlers Loaded..."); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java index 2c0368fa04..6239aa2af9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java @@ -34,7 +34,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target; if (staticObject.getType() < 0) { - _log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); + LOGGER.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); } // Check if the L2PcInstance already target the L2NpcInstance diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7b78de63fe..1ead5e9548 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminAdmin implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminAdmin.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminAdmin.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -121,7 +121,7 @@ public class AdminAdmin implements IAdminCommandHandler } catch (Exception e) { - _log.warning("An error occured while ending olympiad: " + e); + LOGGER.warning("An error occured while ending olympiad: " + e); } activeChar.sendMessage("Heroes formed."); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c517e187f2..ae58296f38 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.UserInfo; */ public class AdminEditChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEditChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEditChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -218,7 +218,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set reputation error: " + e); + LOGGER.warning("Set reputation error: " + e); } activeChar.sendMessage("Usage: //setreputation "); } @@ -261,7 +261,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pk error: " + e); + LOGGER.warning("Set pk error: " + e); } activeChar.sendMessage("Usage: //setpk "); } @@ -291,7 +291,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pvp error: " + e); + LOGGER.warning("Set pvp error: " + e); } activeChar.sendMessage("Usage: //setpvp "); } @@ -321,7 +321,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set Fame error: " + e); + LOGGER.warning("Set Fame error: " + e); } activeChar.sendMessage("Usage: //setfame "); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 1634710c12..2de1bf7bd5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; */ public class AdminEnchant implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEnchant.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEnchant.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -146,7 +146,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a new enchant value."); } @@ -154,7 +154,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a valid new enchant value."); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index 5acf20c5b6..1da9a18c9d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminHeal implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_heal" @@ -57,7 +57,7 @@ public class AdminHeal implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Heal error: " + e); + LOGGER.warning("Heal error: " + e); } activeChar.sendMessage("Incorrect target/radius specified."); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index 549035d177..5ab19d4b39 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminMenu implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminMenu.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminMenu.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -112,7 +112,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_recall_clan_menu")) @@ -141,7 +141,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_goto_char_menu")) @@ -190,7 +190,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -207,7 +207,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5b95022983..cd89f2cc84 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminPunishment implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPunishment.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPunishment.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -86,7 +86,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); } } else @@ -149,7 +149,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); } break; } @@ -186,7 +186,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); } break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java index 934e877d84..764ab77c25 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminRepairChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRepairChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRepairChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -101,7 +101,7 @@ public class AdminRepairChar implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "could not repair char:", e); + LOGGER.log(Level.WARNING, "could not repair char:", e); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java index dfd8ab322b..52c768b06a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList; */ public class AdminShop implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShop.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShop.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -106,7 +106,7 @@ public class AdminShop implements IAdminCommandHandler } catch (Exception e) { - _log.warning("admin buylist failed:" + command); + LOGGER.warning("admin buylist failed:" + command); } final ProductList buyList = BuyListData.getInstance().getBuyList(val); @@ -117,7 +117,7 @@ public class AdminShop implements IAdminCommandHandler } else { - _log.warning("no buylist with id:" + val); + LOGGER.warning("no buylist with id:" + val); activeChar.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index a569d1fca6..780c3b0088 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.QuestList; */ public class AdminShowQuests implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShowQuests.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShowQuests.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -313,7 +313,7 @@ public class AdminShowQuests implements IAdminCommandHandler catch (Exception e) { actor.sendMessage("There was an error."); - _log.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java index ea51fdd106..93293c80e2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class AdminSkill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminSkill.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -526,7 +526,7 @@ public class AdminSkill implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } if (skill != null) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java index bf52975d48..603c953427 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class AdminSpawn implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSpawn.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -377,17 +377,17 @@ public class AdminSpawn implements IAdminCommandHandler default: case 0: { - _log.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); + LOGGER.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); break; } case 1: { - _log.info(""); + LOGGER.info(""); break; } case 2: { - _log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); + LOGGER.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); break; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java index 880aba40c1..a818e7f3d3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminSummon implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSummon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName()); public static final String[] ADMIN_COMMANDS = { @@ -69,7 +69,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -81,7 +81,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index a088b5f7f0..27bcfe9dd8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -50,7 +50,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminTeleport implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminTeleport.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminTeleport.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -525,7 +525,7 @@ public class AdminTeleport implements IAdminCommandHandler if (template1 == null) { activeChar.sendMessage("Incorrect monster template."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); return; } @@ -533,7 +533,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect monster spawn."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); return; } final int respawnTime = spawn.getRespawnDelay() / 1000; @@ -575,7 +575,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect raid spawn."); - _log.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); return; } DBSpawnManager.getInstance().deleteSpawn(spawn, true); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java index a02258ac82..6661cf897c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminUnblockIp implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminUnblockIp.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminUnblockIp.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -68,7 +68,7 @@ public class AdminUnblockIp implements IAdminCommandHandler private boolean unblockIp(String ipAddress, L2PcInstance activeChar) { // LoginServerThread.getInstance().unBlockip(ipAddress); - _log.warning("IP removed by GM " + activeChar.getName()); + LOGGER.warning("IP removed by GM " + activeChar.getName()); return true; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index d5baa52a73..fd68914b26 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -64,7 +64,7 @@ import ai.AbstractNpcAI; */ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPathNode.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPathNode.class.getName()); private final Map _zones = new ConcurrentHashMap<>(); private static final String[] COMMANDS = @@ -484,7 +484,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler catch (Exception e) { activeChar.sendMessage("Failed writing the dump: " + e.getMessage()); - _log.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Augment.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Augment.java index 6f3cdd671a..015cb20ce8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Augment.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Augment.java @@ -57,7 +57,7 @@ public class Augment implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Buy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Buy.java index dedd804298..5084dc1239 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Buy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Buy.java @@ -54,7 +54,7 @@ public class Buy implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 77244e8a99..b937970ce0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -112,7 +112,7 @@ public class ClanWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } } return false; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 383b2ac65a..648a840357 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -54,7 +54,7 @@ public class EventEngine implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 5bb42fb02d..2cc2c9cd2e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -121,7 +121,7 @@ public class ItemAuctionLink implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 1ee7660160..fc06d1b5ea 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -35,13 +35,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty link html!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - _log.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java index 15c9a87b30..bd019c6c2b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java @@ -59,7 +59,7 @@ public class Multisell implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 27bbae841c..8d2b77c311 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -62,7 +62,7 @@ public class NpcViewMod implements IBypassHandler if (!st.hasMoreTokens()) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -101,7 +101,7 @@ public class NpcViewMod implements IBypassHandler { if (st.countTokens() < 2) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -124,7 +124,7 @@ public class NpcViewMod implements IBypassHandler } catch (IllegalArgumentException e) { - _log.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); + LOGGER.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); return false; } break; @@ -571,7 +571,7 @@ public class NpcViewMod implements IBypassHandler String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/DropList.htm"); if (html == null) { - _log.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); + LOGGER.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); return; } html = html.replaceAll("%name%", npc.getName()); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 5ec5c94594..2f52504410 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -113,7 +113,7 @@ public class Observation implements IBypassHandler } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java index 6c16720329..0597ff6ab7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java @@ -66,7 +66,7 @@ public class PlayerHelp implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index d6c31d5495..59491ae669 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -67,7 +67,7 @@ public class PrivateWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 40de431ce5..fd1fe934bd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -63,7 +63,7 @@ public class Wear implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } @@ -73,7 +73,7 @@ public class Wear implements IBypassHandler final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index faa4b3ef97..d74fd3a648 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -39,7 +39,7 @@ public final class AttackTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": this effect must have parameters!"); + LOGGER.warning(getClass().getSimpleName() + ": this effect must have parameters!"); return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 675e1023d2..3b0c1fb514 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -74,7 +74,7 @@ public final class CallSkill extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 924b08d8f7..b582a0e29e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -66,7 +66,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } return skill.isToggle(); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 36bed01887..9b3af7d06a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -39,7 +39,7 @@ public final class DefenceTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); return; } @@ -57,11 +57,11 @@ public final class DefenceTrait extends AbstractEffect } catch (NumberFormatException e) { - _log.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); + LOGGER.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); + LOGGER.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index b6d50cd89c..8fb26ea974 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -48,7 +48,7 @@ public final class Disarmor extends AbstractEffect _slot = ItemTable.SLOTS.getOrDefault(slot, L2Item.SLOT_NONE); if (_slot == L2Item.SLOT_NONE) { - _log.severe("Unknown bodypart slot for effect: " + slot); + LOGGER.severe("Unknown bodypart slot for effect: " + slot); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index adf474fe77..dbc72f8b13 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -59,7 +59,7 @@ public final class Restoration extends AbstractEffect if ((_itemId <= 0) || (_itemCount <= 0)) { effected.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE); - _log.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); + LOGGER.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java index f9a102f869..edcd13b407 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -97,7 +97,7 @@ public final class Summon extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 0fab6deaee..c73eb71458 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -38,7 +38,7 @@ public final class SummonAgathion extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); } _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7ad2935324..d745528a40 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -64,7 +64,7 @@ public final class SummonCubic extends AbstractEffect if (_cubicId < 0) { - _log.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index b10d5cb341..d88f72ee89 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -66,7 +66,7 @@ public class SummonHallucination extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -79,7 +79,7 @@ public class SummonHallucination extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 03d7f27857..15c94c90a2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -87,7 +87,7 @@ public final class SummonMulti extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index ae4549f39f..5779663ae6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -80,7 +80,7 @@ public final class SummonNpc extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -93,7 +93,7 @@ public final class SummonNpc extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } @@ -162,7 +162,7 @@ public final class SummonNpc extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); + LOGGER.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5d8b92393c..a771a8e4cc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -75,14 +75,14 @@ public final class SummonPet extends AbstractEffect final PetItemHolder holder = player.removeScript(PetItemHolder.class); if (holder == null) { - _log.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); + LOGGER.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); return; } final L2ItemInstance collar = holder.getItem(); if (player.getInventory().getItemByObjectId(collar.getObjectId()) != collar) { - _log.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); + LOGGER.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 4528a3f91b..984c53a5ab 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -57,7 +57,7 @@ public final class SummonTrap extends AbstractEffect if (_npcId <= 0) { - _log.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); return; } @@ -76,7 +76,7 @@ public final class SummonTrap extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index c3a9b08bde..8d18d6fecc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -110,7 +110,7 @@ public final class Synergy extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 32ac16aa59..da879def26 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -146,7 +146,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index c9ce6cc000..b7d80e1e34 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -64,7 +64,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -81,7 +81,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 351e687f0f..2ce0c6758c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -88,7 +88,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c950983e3d..1c010ed094 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -91,7 +91,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 7a474f5b8d..956ef40eed 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -102,7 +102,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index fefd166e0d..014142ca85 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -114,7 +114,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 23a72039a7..1f0c32d50d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -97,7 +97,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -124,7 +124,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ca7c1239ec..c34321b251 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -90,7 +90,7 @@ public class BeastSoulShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index d631936c0d..8a39d5177d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -92,7 +92,7 @@ public class BeastSpiritShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index a053b95a9d..e3b723050d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -52,7 +52,7 @@ public class BlessedSoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9800a7e664..52f772757a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -48,7 +48,7 @@ public class BlessedSpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index e7c5629cc7..e1df0bdc7a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -59,7 +59,7 @@ public class EventItem implements IItemHandler } default: { - _log.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); + LOGGER.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); } } return used; @@ -103,7 +103,7 @@ public class EventItem implements IItemHandler }); return true; } - _log.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); + LOGGER.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); return false; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 16a703c486..66eb8ce01c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -54,7 +54,7 @@ public class ExtractableItems implements IItemHandler final List exitems = etcitem.getExtractableItems(); if (exitems == null) { - _log.info("No extractable data defined for " + etcitem); + LOGGER.info("No extractable data defined for " + etcitem); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 5c5598ea69..ac21e53795 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -84,7 +84,7 @@ public class FishShots implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 4773bde656..59fe8bc737 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -51,7 +51,7 @@ public final class Harvester implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 6685ef0b0d..3352b32a09 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -61,7 +61,7 @@ public class ItemSkillsTemplate implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.info("Item " + item + " does not have registered any skill for handler."); + LOGGER.info("Item " + item + " does not have registered any skill for handler."); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 05c1ac3f7d..d3ffb95e30 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -49,7 +49,7 @@ public class SoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index ddf0402d2b..87f06565c2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -48,7 +48,7 @@ public class SpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java index 7144892fa5..59ecba44bb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ClanWarsList implements IUserCommandHandler { - private static final Logger _log = Logger.getLogger(ClanWarsList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanWarsList.class.getName()); private static final int[] COMMAND_IDS = { 88, @@ -119,7 +119,7 @@ public class ClanWarsList implements IUserCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } return true; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java index 7dced5f20e..5e98fa04f5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - _log.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); return; } @@ -133,7 +133,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // When nobody can enter if (enterGroup == null) { - _log.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); + LOGGER.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); return; } @@ -214,7 +214,7 @@ public abstract class AbstractInstance extends AbstractNpcAI } else { - _log.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); + LOGGER.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 87fe82da43..1a091c8e32 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -430,7 +430,7 @@ public final class ChamberOfDelusion extends AbstractInstance } catch (Exception e) { - _log.log(Level.WARNING, "Error occured in room change task: ", e); + LOGGER.log(Level.WARNING, "Error occured in room change task: ", e); } }, nextInterval - 5000); world.setParameter("roomChangeTask", roomChangeTask); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 8d437b8318..38eb8cc483 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -655,7 +655,7 @@ public final class Kamaloka extends AbstractInstance } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } return null; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java index c96029eb3e..8fc543646f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java @@ -274,7 +274,7 @@ public final class Q10814_BefittingOfTheStatus extends Quest final String text = getHtm(player.getHtmlPrefix(), fileName); if (text == null) { - _log.info("Cannot find HTML file for " + Q10814_BefittingOfTheStatus.class.getSimpleName() + " Quest: " + fileName); + LOGGER.info("Cannot find HTML file for " + Q10814_BefittingOfTheStatus.class.getSimpleName() + " Quest: " + fileName); return null; } html.setHtml(text); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java index 4c4875072b..a65951b09c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java @@ -452,7 +452,7 @@ import quests.Q10843_AnomalyInTheEnchantedValley.Q10843_AnomalyInTheEnchantedVal */ public class QuestMasterHandler { - private static final Logger _log = Logger.getLogger(QuestMasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(QuestMasterHandler.class.getName()); private static final Class[] QUESTS = { @@ -895,7 +895,7 @@ public class QuestMasterHandler } catch (Exception e) { - _log.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); + LOGGER.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java index bcd888210f..623b41de9f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java @@ -74,7 +74,7 @@ public abstract class AirShipController extends AbstractNpcAI } } - public static final Logger _log = Logger.getLogger(AirShipController.class.getName()); + public static final Logger LOGGER = Logger.getLogger(AirShipController.class.getName()); protected int _dockZone = 0; protected int _shipSpawnX = 0; protected int _shipSpawnY = 0; @@ -334,7 +334,7 @@ public abstract class AirShipController extends AbstractNpcAI final L2ScriptZone zone = ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class); if (zone == null) { - _log.warning(getName() + ": Invalid zone " + _dockZone + ", controller disabled"); + LOGGER.warning(getName() + ": Invalid zone " + _dockZone + ", controller disabled"); _isBusy = true; return; } @@ -344,7 +344,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (_arrivalPath.length == 0) { - _log.warning(getName() + ": Zero arrival path length."); + LOGGER.warning(getName() + ": Zero arrival path length."); _arrivalPath = null; } else @@ -352,7 +352,7 @@ public abstract class AirShipController extends AbstractNpcAI p = _arrivalPath[_arrivalPath.length - 1]; if (!zone.isInsideZone(p.getLocation())) { - _log.warning(getName() + ": Arrival path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") not in zone " + _dockZone); + LOGGER.warning(getName() + ": Arrival path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") not in zone " + _dockZone); _arrivalPath = null; } } @@ -361,7 +361,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (!ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class).isInsideZone(_shipSpawnX, _shipSpawnY, _shipSpawnZ)) { - _log.warning(getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled"); + LOGGER.warning(getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled"); _isBusy = true; return; } @@ -371,7 +371,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (_departPath.length == 0) { - _log.warning(getName() + ": Zero depart path length."); + LOGGER.warning(getName() + ": Zero depart path length."); _departPath = null; } else @@ -379,7 +379,7 @@ public abstract class AirShipController extends AbstractNpcAI p = _departPath[_departPath.length - 1]; if (zone.isInsideZone(p.getLocation())) { - _log.warning(getName() + ": Departure path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") in zone " + _dockZone); + LOGGER.warning(getName() + ": Departure path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") in zone " + _dockZone); _departPath = null; } } @@ -389,11 +389,11 @@ public abstract class AirShipController extends AbstractNpcAI { if (_fuelTable == null) { - _log.warning(getName() + ": Fuel consumption not defined."); + LOGGER.warning(getName() + ": Fuel consumption not defined."); } else if (_teleportsTable.length != _fuelTable.length) { - _log.warning(getName() + ": Fuel consumption not match teleport list."); + LOGGER.warning(getName() + ": Fuel consumption not match teleport list."); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatGludinRune.java index c162606bf1..7edfc605df 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatGludinRune implements Runnable { - private static final Logger _log = Logger.getLogger(BoatGludinRune.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatGludinRune.class.getName()); // Time: 1151s private static final VehiclePathPoint[] GLUDIN_TO_RUNE = @@ -343,7 +343,7 @@ public class BoatGludinRune implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index 1805617eaf..fea42bcaa9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatInnadrilTour implements Runnable { - private static final Logger _log = Logger.getLogger(BoatInnadrilTour.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatInnadrilTour.class.getName()); // Time: 1867s private static final VehiclePathPoint[] TOUR = @@ -186,7 +186,7 @@ public class BoatInnadrilTour implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index c04177df76..1e62f23d02 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatRunePrimeval implements Runnable { - private static final Logger _log = Logger.getLogger(BoatRunePrimeval.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatRunePrimeval.class.getName()); // Time: 239s private static final VehiclePathPoint[] RUNE_TO_PRIMEVAL = @@ -168,7 +168,7 @@ public class BoatRunePrimeval implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseRecievePacket.java index b8e2b08f14..33146d6d53 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseRecievePacket.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public abstract class BaseRecievePacket { - private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseRecievePacket.class.getName()); private final byte[] _decrypt; private int _off; @@ -78,7 +78,7 @@ public abstract class BaseRecievePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } return result; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseSendablePacket.java index 894ea357b0..c29adc3bce 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseSendablePacket.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; */ public abstract class BaseSendablePacket { - private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseSendablePacket.class.getName()); private final ByteArrayOutputStream _bao; @@ -78,7 +78,7 @@ public abstract class BaseSendablePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } _bao.write(0); @@ -93,7 +93,7 @@ public abstract class BaseSendablePacket } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java index a2f78c7c94..a11ea8c3b5 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; public class ScrambledKeyPair { - private static Logger _log = Logger.getLogger(ScrambledKeyPair.class.getName()); + private static Logger LOGGER = Logger.getLogger(ScrambledKeyPair.class.getName()); public KeyPair _pair; public byte[] _scrambledModulus; @@ -66,7 +66,7 @@ public class ScrambledKeyPair { scrambledMod[0x40 + i] = (byte) (scrambledMod[0x40 + i] ^ scrambledMod[i]); } - _log.finer("Modulus was scrambled"); + LOGGER.finer("Modulus was scrambled"); return scrambledMod; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java index a4df772cc3..57a47cf456 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class ForumsBBSManager extends BaseBBSManager { - private static Logger _log = Logger.getLogger(ForumsBBSManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(ForumsBBSManager.class.getName()); private final List _table; private int _lastid = 1; @@ -51,7 +51,7 @@ public class ForumsBBSManager extends BaseBBSManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); } } @@ -61,7 +61,7 @@ public class ForumsBBSManager extends BaseBBSManager public void initRoot() { _table.forEach(f -> f.vload()); - _log.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); } /** diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java index 609f0858d5..4aa8b72edb 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class CharNameTable { - private static Logger _log = Logger.getLogger(CharNameTable.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharNameTable.class.getName()); private final Map _chars = new ConcurrentHashMap<>(); private final Map _accessLevels = new ConcurrentHashMap<>(); @@ -114,7 +114,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); } if (id > 0) @@ -162,7 +162,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return null; // not found @@ -190,7 +190,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); } return result; } @@ -211,7 +211,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); } return 0; } @@ -232,7 +232,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -253,7 +253,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); } return 0; } @@ -274,7 +274,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -294,9 +294,9 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); } public static CharNameTable getInstance() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/DocumentBase.java index 37410b0b38..fde34c2bc6 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/DocumentBase.java @@ -148,7 +148,7 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public abstract class DocumentBase { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final File _file; protected final Map _tables = new HashMap<>(); @@ -171,7 +171,7 @@ public abstract class DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Error loading file " + _file, e); + LOGGER.log(Level.SEVERE, "Error loading file " + _file, e); } return doc; } @@ -344,7 +344,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -361,7 +361,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -375,7 +375,7 @@ public abstract class DocumentBase return new ConditionLogicNot(parseCondition(n, template)); } } - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); return null; } @@ -900,7 +900,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1095,7 +1095,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1135,7 +1135,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); + LOGGER.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); } } cond = joinAnd(cond, new ConditionUsingItemType(mask)); @@ -1156,7 +1156,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); + LOGGER.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); } } cond = joinAnd(cond, new ConditionUsingSlotType(mask)); @@ -1192,7 +1192,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1222,7 +1222,7 @@ public abstract class DocumentBase } if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java index 4d3be938c9..c425e3360c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.LinkedList; import java.util.List; import java.util.logging.Level; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -43,6 +44,8 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public final class DocumentItem extends DocumentBase implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(DocumentItem.class.getName()); + private Item _currentItem = null; private final List _itemsInFile = new LinkedList<>(); @@ -92,7 +95,7 @@ public final class DocumentItem extends DocumentBase implements IGameXmlReader } catch (Exception e) { - _log.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); + LOGGER.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 6832094027..5343f17e51 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.util.MathUtil; */ public class GeoEngine { - protected static final Logger _log = Logger.getLogger(GeoEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GeoEngine.class.getName()); private final ABlock[][] _blocks; private final BlockNull _nullBlock; @@ -71,7 +71,7 @@ public class GeoEngine */ public GeoEngine() { - _log.info("GeoEngine: Initializing..."); + LOGGER.info("GeoEngine: Initializing..."); // initialize block container _blocks = new ABlock[GeoStructure.GEO_BLOCKS_X][GeoStructure.GEO_BLOCKS_Y]; @@ -105,7 +105,7 @@ public class GeoEngine } } - _log.info("GeoEngine: Loaded " + loaded + " geodata files."); + LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files."); // avoid wrong configs when no files are loaded if (loaded == 0) @@ -113,12 +113,12 @@ public class GeoEngine if (Config.PATHFINDING) { Config.PATHFINDING = false; - _log.info("GeoEngine: Forcing PathFinding setting to false."); + LOGGER.info("GeoEngine: Forcing PathFinding setting to false."); } if (Config.COORD_SYNCHRONIZE == 2) { Config.COORD_SYNCHRONIZE = -1; - _log.info("GeoEngine: Forcing CoordSynchronize setting to -1."); + LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); } } @@ -185,7 +185,7 @@ public class GeoEngine // check data consistency if (buffer.remaining() > 0) { - _log.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); + LOGGER.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); } // loading was successful @@ -194,8 +194,8 @@ public class GeoEngine catch (Exception e) { // an error occured while loading, load null blocks - _log.warning("GeoEngine: Error while loading " + filename + " region file."); - _log.warning(e.getMessage()); + LOGGER.warning("GeoEngine: Error while loading " + filename + " region file."); + LOGGER.warning(e.getMessage()); e.printStackTrace(); // replace whole region file with null blocks @@ -300,7 +300,7 @@ public class GeoEngine if (block == null) // null block check { // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) - // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // LOGGER.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java index ece8351c5e..b33b0292ac 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java @@ -57,11 +57,11 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); + LOGGER.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); } } - _log.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); + LOGGER.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); } @Override @@ -109,7 +109,7 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); return null; } finally diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IActionHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IActionHandler.java index c4addd7df5..3640b57f65 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IActionHandler.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IActionHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionHandler { - Logger _log = Logger.getLogger(IActionHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java index 35c546715c..5c5b946828 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionShiftHandler { - Logger _log = Logger.getLogger(IActionShiftHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionShiftHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IBypassHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IBypassHandler.java index a5a6295386..626cdb2b17 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IBypassHandler.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IBypassHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public interface IBypassHandler { - Logger _log = Logger.getLogger(IBypassHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IBypassHandler.class.getName()); /** * This is the worker method that is called when someone uses an bypass command. diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IItemHandler.java index 2f3d043ad0..a2079cc4ec 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IItemHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public interface IItemHandler { - Logger _log = Logger.getLogger(IItemHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IItemHandler.class.getName()); /** * Launch task associated to the item. diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java index 4030ad83de..0f9c7b0132 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentType; */ public interface IPunishmentHandler { - Logger _log = Logger.getLogger(IPunishmentHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IPunishmentHandler.class.getName()); void onStart(PunishmentTask task); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java index 72b8a7b21a..d1cb086c89 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IUserCommandHandler { - Logger _log = Logger.getLogger(IUserCommandHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IUserCommandHandler.class.getName()); /** * this is the worker method that is called when someone uses an admin command. diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java index e16e1eb679..9712fd7b04 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -60,7 +60,7 @@ import com.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi */ public final class CommissionManager { - private static final Logger _log = Logger.getLogger(CommissionManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CommissionManager.class.getName()); private static final int INTERACTION_DISTANCE = 250; private static final int ITEMS_LIMIT_PER_REQUEST = 999; @@ -103,7 +103,7 @@ public final class CommissionManager final L2ItemInstance itemInstance = itemInstances.get(rs.getInt("item_object_id")); if (itemInstance == null) { - _log.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); + LOGGER.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); continue; } final CommissionItem commissionItem = new CommissionItem(commissionId, itemInstance, rs.getLong("price_per_unit"), rs.getTimestamp("start_time").toInstant(), rs.getByte("duration_in_days")); @@ -121,7 +121,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); } } @@ -270,7 +270,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); player.sendPacket(SystemMessageId.THE_ITEM_HAS_FAILED_TO_BE_REGISTERED); player.sendPacket(ExResponseCommissionRegister.FAILED); } @@ -409,7 +409,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); } return false; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java index 7f4c6abd61..f635c19883 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class FactionManager { - private static Logger _log = Logger.getLogger(FactionManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(FactionManager.class.getName()); private final Map _playerFactions = new ConcurrentHashMap<>(); protected FactionManager() @@ -57,9 +57,9 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); } public final int getFactionByCharId(int id) @@ -91,7 +91,7 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return 0; // not found diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index b0fdfdf390..dc63278e16 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.entity.Fort; public final class FortManager implements InstanceListManager { - protected static final Logger _log = Logger.getLogger(FortManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); private final Map _forts = new ConcurrentSkipListMap<>(); @@ -131,7 +131,7 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - _log.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); for (Fort fort : getForts()) { fort.getSiege().loadSiegeGuard(); @@ -139,7 +139,7 @@ public final class FortManager implements InstanceListManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index aa7e2d3153..0a5245dafc 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class FortSiegeManager { - private static final Logger _log = Logger.getLogger(FortSiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FortSiegeManager.class.getName()); private int _attackerMaxClans = 500; // Max number of clans @@ -101,7 +101,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -122,7 +122,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); + LOGGER.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); } // Siege setting @@ -163,7 +163,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading commander(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading commander(s) for " + fort.getName() + " fort."); } } @@ -189,7 +189,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading flag(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading flag(s) for " + fort.getName() + " fort."); } } _flagList.put(fort.getResidenceId(), _flagSpawns); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index 14f412ec48..338620a64f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; public final class GraciaSeedsManager { - private static final Logger _log = Logger.getLogger(GraciaSeedsManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GraciaSeedsManager.class.getName()); public static String ENERGY_SEEDS = "EnergySeeds"; @@ -70,7 +70,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); + LOGGER.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); break; } } @@ -124,7 +124,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); + LOGGER.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); } } } @@ -134,7 +134,7 @@ public final class GraciaSeedsManager final Quest quest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (quest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -155,7 +155,7 @@ public final class GraciaSeedsManager final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (esQuest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -171,7 +171,7 @@ public final class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { - _log.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); + LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 9c43355936..0a62e46364 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -47,7 +47,7 @@ public final class GrandBossManager implements IStorable private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?"; private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?"; - protected static Logger _log = Logger.getLogger(GrandBossManager.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GrandBossManager.class.getName()); protected static Map _bosses = new ConcurrentHashMap<>(); @@ -83,26 +83,26 @@ public final class GrandBossManager implements IStorable final int status = rs.getInt("status"); _bossStatus.put(bossId, status); _storedInfo.put(bossId, info); - _log.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); + LOGGER.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); if (status > 0) { - _log.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); + LOGGER.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); } } else { - _log.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); + LOGGER.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); } } - _log.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); } ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000); } @@ -115,7 +115,7 @@ public final class GrandBossManager implements IStorable public void setBossStatus(int bossId, int status) { _bossStatus.put(bossId, status); - _log.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); + LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); updateDb(bossId, true); } @@ -194,7 +194,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); return false; } return true; @@ -242,7 +242,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index e8b430a5df..c7290b6912 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public final class ItemsOnGroundManager implements Runnable { - private static final Logger _log = Logger.getLogger(ItemsOnGroundManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemsOnGroundManager.class.getName()); private final Set _items = ConcurrentHashMap.newKeySet(); @@ -88,7 +88,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); } } @@ -137,11 +137,11 @@ public final class ItemsOnGroundManager implements Runnable } } } - _log.info(getClass().getSimpleName() + ": Loaded " + count + " items."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + count + " items."); } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); } if (Config.EMPTY_DROPPED_ITEM_TABLE_AFTER_LOAD) @@ -185,7 +185,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e1) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); } } @@ -235,13 +235,13 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); } } } catch (SQLException e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java index ba4fdd6b6c..f47cf3f813 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.variables.PlayerVariables; */ public class MentorManager { - private static final Logger _log = Logger.getLogger(MentorManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MentorManager.class.getName()); private final Map> _menteeData = new ConcurrentHashMap<>(); private final Map _mentors = new ConcurrentHashMap<>(); @@ -65,7 +65,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -85,7 +85,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -104,7 +104,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } finally { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index f0f9d590c3..07ca9d909e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class PetitionManager { - protected static final Logger _log = Logger.getLogger(PetitionManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PetitionManager.class.getName()); private final Map _pendingPetitions; private final Map _completedPetitions; @@ -55,7 +55,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getCompletedPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() @@ -63,7 +63,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getPendingPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } public boolean acceptPetition(L2PcInstance respondingAdmin, int petitionId) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java index c1df0ca78b..6208afb86b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.Shutdown; */ public class ServerRestartManager { - static final Logger _log = Logger.getLogger(ServerRestartManager.class.getName()); + static final Logger LOGGER = Logger.getLogger(ServerRestartManager.class.getName()); private String nextRestartTime = "unknown"; @@ -72,12 +72,12 @@ public class ServerRestartManager { nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime()); ThreadPool.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000)); - _log.info("Scheduled server restart at " + lastRestart.getTime() + "."); + LOGGER.info("Scheduled server restart at " + lastRestart.getTime() + "."); } } catch (Exception e) { - _log.info("The scheduled server restart config is not set properly, please correct it!"); + LOGGER.info("The scheduled server restart config is not set properly, please correct it!"); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java index 728cb6ca44..38d9a81244 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; public final class SiegeManager { - private static final Logger _log = Logger.getLogger(SiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SiegeManager.class.getName()); private final Map> _controlTowers = new HashMap<>(); private final Map> _flameTowers = new HashMap<>(); @@ -103,7 +103,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -152,7 +152,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); } } @@ -183,7 +183,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); } } _controlTowers.put(castle.getResidenceId(), controlTowers); @@ -289,7 +289,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java index 5e16e5a91f..876a3a1ec9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class MessageDeletionTask implements Runnable { - private static final Logger _log = Logger.getLogger(MessageDeletionTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MessageDeletionTask.class.getName()); final int _msgId; @@ -76,7 +76,7 @@ public final class MessageDeletionTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); } } MailManager.getInstance().deleteMessageInDb(msg.getId()); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/BlockList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/BlockList.java index 627b0dbbe4..3ec7e52fe7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/BlockList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/BlockList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BlockList { - private static Logger _log = Logger.getLogger(BlockList.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlockList.class.getName()); private static final Map> OFFLINE_LIST = new ConcurrentHashMap<>(); private final L2PcInstance _owner; @@ -91,7 +91,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); } return list; } @@ -122,7 +122,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java index 7be7f3cb10..f44f27266b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate; */ public final class CharEffectList { - private static final Logger _log = Logger.getLogger(CharEffectList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); /** Queue containing all effects from buffs for this effect list. */ private volatile Queue _actives; /** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */ @@ -897,7 +897,7 @@ public final class CharEffectList // Passive effects don't need stack type! if (!skill.getAbnormalType().isNone()) { - _log.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); + LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); } // Check for passive skill conditions. diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CursedWeapon.java index d579628d09..a9be2c6a4a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class CursedWeapon implements INamable { - private static final Logger _log = Logger.getLogger(CursedWeapon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CursedWeapon.class.getName()); // _name is the name of the cursed weapon associated with its ID. private final String _name; @@ -95,7 +95,7 @@ public class CursedWeapon implements INamable if ((_player != null) && _player.isOnline()) { // Remove from player - _log.info(_name + " being removed online."); + LOGGER.info(_name + " being removed online."); _player.abortAttack(); @@ -134,7 +134,7 @@ public class CursedWeapon implements INamable else { // Remove from Db - _log.info(_name + " being removed offline."); + LOGGER.info(_name + " being removed offline."); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?"); @@ -145,7 +145,7 @@ public class CursedWeapon implements INamable del.setInt(2, _itemId); if (del.executeUpdate() != 1) { - _log.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); + LOGGER.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); } // Restore the reputation @@ -154,12 +154,12 @@ public class CursedWeapon implements INamable ps.setInt(3, _playerId); if (ps.executeUpdate() != 1) { - _log.warning("Error while updating karma & pkkills for userId " + _playerId); + LOGGER.warning("Error while updating karma & pkkills for userId " + _playerId); } } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); } } } @@ -196,7 +196,7 @@ public class CursedWeapon implements INamable else if (_item != null) { _item.decayMe(); - _log.info(_name + " item has been removed from World."); + LOGGER.info(_name + " item has been removed from World."); } } @@ -492,7 +492,7 @@ public class CursedWeapon implements INamable } catch (SQLException e) { - _log.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); + LOGGER.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java index e1bbddd336..96583b545c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -81,7 +81,7 @@ import com.l2jmobius.gameserver.util.Util; public class L2Clan implements IIdentifiable, INamable { - private static final Logger _log = Logger.getLogger(L2Clan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Clan.class.getName()); // SQL queries private static final String INSERT_CLAN_DATA = "INSERT INTO clan_data (clan_id,clan_name,clan_level,hasCastle,blood_alliance_count,blood_oath_count,ally_id,ally_name,leader_id,crest_id,crest_large_id,ally_crest_id,new_leader_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -273,7 +273,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); } } @@ -313,14 +313,14 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); } } broadcastClanStatus(); broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1).addString(member.getName())); - _log.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); + LOGGER.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); } /** @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - _log.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + getName() + " without clan leader!"); return ""; } return _leader.getName(); @@ -433,7 +433,7 @@ public class L2Clan implements IIdentifiable, INamable final L2ClanMember exMember = _members.remove(objectId); if (exMember == null) { - _log.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); + LOGGER.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); return; } final int leadssubpledge = getLeaderSubPledge(objectId); @@ -888,7 +888,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -932,7 +932,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -948,7 +948,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); } // Update variables at database @@ -991,7 +991,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); } } @@ -1032,7 +1032,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); } } @@ -1062,7 +1062,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); } } @@ -1137,7 +1137,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); } } @@ -1158,7 +1158,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); } } @@ -1200,7 +1200,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); } _notice = notice; @@ -1267,7 +1267,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); + LOGGER.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); } } } @@ -1275,7 +1275,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); } } @@ -1351,7 +1351,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.warning("Subpledge " + subType + " does not exist for clan " + this); + LOGGER.warning("Subpledge " + subType + " does not exist for clan " + this); return oldSkill; } } @@ -1383,7 +1383,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); @@ -1435,7 +1435,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } @@ -1781,7 +1781,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); } } @@ -1890,7 +1890,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); } broadcastToOnlineMembers(new PledgeShowInfoUpdate(_leader.getClan())); @@ -1955,7 +1955,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); } } @@ -1987,7 +1987,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); } } @@ -2023,7 +2023,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } for (L2ClanMember cm : getMembers()) @@ -2058,7 +2058,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); } } } @@ -2174,7 +2174,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); } } } @@ -2717,7 +2717,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); } setLevel(level); @@ -2763,7 +2763,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2800,7 +2800,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); } if (onlyThisClan) @@ -2846,7 +2846,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Mentee.java index 6122c5f6ac..a1eb3d2480 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class L2Mentee { - private static final Logger _log = Logger.getLogger(L2Mentee.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Mentee.class.getName()); private final int _objectId; private String _name; @@ -65,7 +65,7 @@ public class L2Mentee } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } else diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java index 5f14864046..38044ee767 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2Party extends AbstractPlayerGroup { - private static final Logger _log = Logger.getLogger(L2Party.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Party.class.getName()); // @formatter:off private static final double[] BONUS_EXP_SP = @@ -536,7 +536,7 @@ public class L2Party extends AbstractPlayerGroup } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } SystemMessage msg; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Territory.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Territory.java index 41cb26df2b..2ee5d868d2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Territory.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Territory.java @@ -28,7 +28,7 @@ import com.l2jmobius.commons.util.Rnd; */ public class L2Territory { - private static Logger _log = Logger.getLogger(L2Territory.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2Territory.class.getName()); protected static class Point { @@ -176,7 +176,7 @@ public class L2Territory return new Location(x, y, Rnd.get(zmin, _zMax)); } } - _log.warning("Can't make point for territory " + _terr); + LOGGER.warning("Can't make point for territory " + _terr); return null; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MacroList.java index 737e876e1e..577b101249 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MacroList.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SendMacroList; public class MacroList implements IRestorable { - private static final Logger _log = Logger.getLogger(MacroList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MacroList.class.getName()); private final L2PcInstance _owner; private int _macroId; @@ -154,7 +154,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store macro:", e); + LOGGER.log(Level.WARNING, "could not store macro:", e); } } @@ -169,7 +169,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete macro:", e); + LOGGER.log(Level.WARNING, "could not delete macro:", e); } } @@ -215,7 +215,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store shortcuts:", e); + LOGGER.log(Level.WARNING, "could not store shortcuts:", e); return false; } return true; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ShortCuts.java index 3f8d959ef6..81e2c6f902 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ShortCuts.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; public class ShortCuts implements IRestorable { - private static Logger _log = Logger.getLogger(ShortCuts.class.getName()); + private static Logger LOGGER = Logger.getLogger(ShortCuts.class.getName()); private static final int MAX_SHORTCUTS_PER_BAR = 12; private final L2PcInstance _owner; private final Map _shortCuts = new TreeMap<>(); @@ -100,7 +100,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); } } @@ -165,7 +165,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); } } @@ -195,7 +195,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); return false; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TradeList.java index eeee7d0cae..f0f5a42ae6 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TradeList.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class TradeList { - private static final Logger _log = Logger.getLogger(TradeList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TradeList.class.getName()); private final L2PcInstance _owner; private L2PcInstance _partner; @@ -198,45 +198,45 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Object o = L2World.getInstance().findObject(objectId); if (!(o instanceof L2ItemInstance)) { - _log.warning(_owner.getName() + ": Trying to add something other than an item!"); + LOGGER.warning(_owner.getName() + ": Trying to add something other than an item!"); return null; } final L2ItemInstance item = (L2ItemInstance) o; if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { - _log.warning(_owner.getName() + ": Attempt to add a restricted item!"); + LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) { - _log.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; } if ((count <= 0) || (count > item.getCount())) { - _log.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); return null; } if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -244,7 +244,7 @@ public class TradeList { if (checkitem.getObjectId() == objectId) { - _log.warning(_owner.getName() + ": Attempt to add an item that is already present!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that is already present!"); return null; } } @@ -268,14 +268,14 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); return null; } @@ -286,13 +286,13 @@ public class TradeList if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -315,13 +315,13 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } if (count < 0) { - _log.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); return null; } @@ -335,7 +335,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return null; } partnerList.invalidateConfirmation(); @@ -410,7 +410,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return false; } @@ -475,7 +475,7 @@ public class TradeList // Check for Owner validity if ((_owner == null) || (L2World.getInstance().getPlayer(_owner.getObjectId()) == null)) { - _log.warning("Invalid owner of TradeList"); + LOGGER.warning("Invalid owner of TradeList"); return false; } @@ -485,7 +485,7 @@ public class TradeList final L2ItemInstance item = _owner.checkItemManipulation(titem.getObjectId(), titem.getCount(), "transfer"); if ((item == null) || (item.getCount() < 1)) { - _log.warning(_owner.getName() + ": Invalid Item in TradeList"); + LOGGER.warning(_owner.getName() + ": Invalid Item in TradeList"); return false; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 75c6e98235..91d739cd2d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -632,7 +632,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } @@ -690,7 +690,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -803,7 +803,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = getAggroList().get(target); if (ai == null) { - _log.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 944e723989..1ebbe0e5f3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -176,7 +176,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class L2Character extends L2Object implements ISkillsHolder, IDeletable { - public static final Logger _log = Logger.getLogger(L2Character.class.getName()); + public static final Logger LOGGER = Logger.getLogger(L2Character.class.getName()); private volatile Set> _attackByList; @@ -3278,7 +3278,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Temporary fix for character outside world region errors (should not happen) if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) { - _log.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); + LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); if (isPlayer()) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 8679593b56..884011206b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -624,7 +624,7 @@ public class L2Npc extends L2Character } else { - _log.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); } } } @@ -1189,7 +1189,7 @@ public class L2Npc extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } if (isChannelized()) @@ -1560,7 +1560,7 @@ public class L2Npc extends L2Character if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); + LOGGER.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); return null; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java index 94fe6bb6b5..3dd9a9d68e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java @@ -395,7 +395,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed stopMove().", e); + LOGGER.log(Level.SEVERE, "Failed stopMove().", e); } try @@ -404,7 +404,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed oustPlayers().", e); + LOGGER.log(Level.SEVERE, "Failed oustPlayers().", e); } final ZoneRegion oldZoneRegion = ZoneManager.getInstance().getRegion(this); @@ -415,7 +415,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } oldZoneRegion.removeFromZones(this); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java index 8e72579b54..05339545d3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java @@ -61,7 +61,7 @@ public class L2ControlTowerInstance extends L2Tower } catch (Exception e) { - _log.log(Level.WARNING, "Error at L2ControlTowerInstance", e); + LOGGER.log(Level.WARNING, "Error at L2ControlTowerInstance", e); } } _guards.clear(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 6c554e10e0..91548e2a10 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -100,7 +100,7 @@ public class L2DecoyInstance extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } @@ -126,7 +126,7 @@ public class L2DecoyInstance extends L2Character } catch (Throwable e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index f9aa07f44d..97c2348dec 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -123,7 +123,7 @@ public class L2DefenderInstance extends L2Attackable if ((_fort == null) && (_castle == null)) { - _log.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); + LOGGER.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 4fb7bbb976..baab09b858 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -219,7 +219,7 @@ public final class L2DoorInstance extends L2Character } else { - _log.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); + LOGGER.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 71096be532..1519fc6308 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -74,14 +74,14 @@ public class L2MerchantInstance extends L2NpcInstance final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } if (!buyList.isNpcAllowed(getId())) { - _log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); + LOGGER.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index f4338c430c..7e23c01876 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -1335,7 +1335,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Attempted to remove unknown RecipeList: " + recipeId); + LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } for (Shortcut sc : getAllShortCuts()) @@ -1360,7 +1360,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -1376,7 +1376,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -2628,7 +2628,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Skipping null auto-get skill for player: " + toString()); + LOGGER.warning("Skipping null auto-get skill for player: " + toString()); } } } @@ -3280,7 +3280,7 @@ public final class L2PcInstance extends L2Playable final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); + LOGGER.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); return null; } // Sends message to client if requested @@ -3323,7 +3323,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof L2EtcItem ? (L2EtcItem) item : null); if (handler == null) { - _log.warning("No item handler registered for Herb ID " + item.getId() + "!"); + LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!"); } else { @@ -3841,7 +3841,7 @@ public final class L2PcInstance extends L2Playable // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { - _log.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); return null; } @@ -3849,19 +3849,19 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return null; } if ((count < 0) || ((count > 1) && !item.isStackable())) { - _log.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); return null; } if (count > item.getCount()) { - _log.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); return null; } @@ -3890,7 +3890,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_protectEndTime > 0))) { - _log.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _protectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -3900,7 +3900,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_teleportProtectEndTime > 0))) { - _log.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _teleportProtectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -4415,7 +4415,7 @@ public final class L2PcInstance extends L2Playable if (!object.isItem()) { // dont try to pickup anything that is not an item :) - _log.warning(this + " trying to pickup wrong target." + getTarget()); + LOGGER.warning(this + " trying to pickup wrong target." + getTarget()); return; } @@ -4515,7 +4515,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -5177,11 +5177,11 @@ public final class L2PcInstance extends L2Playable if (isKarmaDrop) { - _log.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } else { - _log.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } if (++dropCount >= dropLimit) @@ -6275,7 +6275,7 @@ public final class L2PcInstance extends L2Playable L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level); if (accessLevel == null) { - _log.warning("Can't find access level " + level + " for character " + toString()); + LOGGER.warning("Can't find access level " + level + " for character " + toString()); accessLevel = AdminData.getInstance().getAccessLevel(0); } @@ -6284,7 +6284,7 @@ public final class L2PcInstance extends L2Playable accessLevel = AdminData.getInstance().getAccessLevel(Config.DEFAULT_ACCESS_LEVEL); if (accessLevel == null) { - _log.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); + LOGGER.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); accessLevel = AdminData.getInstance().getAccessLevel(0); Config.DEFAULT_ACCESS_LEVEL = 0; } @@ -6310,7 +6310,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); + LOGGER.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); } } @@ -6318,11 +6318,11 @@ public final class L2PcInstance extends L2Playable if (accessLevel == null) { - _log.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); + LOGGER.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); } else if (level > 0) { - _log.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); + LOGGER.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); } } @@ -6431,7 +6431,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed updating character online status.", e); + LOGGER.log(Level.SEVERE, "Failed updating character online status.", e); } } @@ -6484,7 +6484,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); return false; } return true; @@ -6633,7 +6633,7 @@ public final class L2PcInstance extends L2Playable catch (Exception e) { player.setBaseClass(activeClassId); - _log.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); + LOGGER.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); } // Restore Subclass Data (cannot be done earlier in function) @@ -6656,7 +6656,7 @@ public final class L2PcInstance extends L2Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - _log.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -6797,7 +6797,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed loading character.", e); + LOGGER.log(Level.SEVERE, "Failed loading character.", e); } return player; } @@ -6887,7 +6887,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); } return true; } @@ -6995,7 +6995,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); } } @@ -7025,7 +7025,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); } } @@ -7041,7 +7041,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); } } @@ -7056,7 +7056,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.severe("Could not delete premium item: " + e); + LOGGER.severe("Could not delete premium item: " + e); } } @@ -7174,7 +7174,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); } } @@ -7204,7 +7204,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); } } @@ -7328,7 +7328,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store char effect data: ", e); } } @@ -7360,7 +7360,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char item reuse data: ", e); + LOGGER.log(Level.WARNING, "Could not store char item reuse data: ", e); } } @@ -7449,7 +7449,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); } } @@ -7509,12 +7509,12 @@ public final class L2PcInstance extends L2Playable } // else // { - // _log.warning("Could not store new skill, it's null!"); + // LOGGER.warning("Could not store new skill, it's null!"); // } } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7549,7 +7549,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7577,7 +7577,7 @@ public final class L2PcInstance extends L2Playable if (skill == null) { - _log.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); + LOGGER.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); continue; } @@ -7600,7 +7600,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); } } @@ -7658,7 +7658,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } } @@ -7724,7 +7724,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); } } @@ -7788,7 +7788,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); } // Calculate henna modifiers of this player. @@ -7856,7 +7856,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed removing character henna.", e); + LOGGER.log(Level.SEVERE, "Failed removing character henna.", e); } // Calculate Henna modifiers of this L2PcInstance @@ -7955,7 +7955,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed saving character henna.", e); + LOGGER.log(Level.SEVERE, "Failed saving character henna.", e); } // Task for henna duration @@ -8110,7 +8110,7 @@ public final class L2PcInstance extends L2Playable if (isLocked()) { - _log.warning("Player " + getName() + " tried to restart/logout during class change."); + LOGGER.warning("Player " + getName() + " tried to restart/logout during class change."); return false; } @@ -8461,7 +8461,7 @@ public final class L2PcInstance extends L2Playable if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { - _log.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); + LOGGER.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -9596,7 +9596,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); return false; } @@ -9711,7 +9711,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -9799,7 +9799,7 @@ public final class L2PcInstance extends L2Playable final L2PcTemplate pcTemplate = PlayerTemplateData.getInstance().getTemplate(classId); if (pcTemplate == null) { - _log.severe("Missing template for classId: " + classId); + LOGGER.severe("Missing template for classId: " + classId); throw new Error(); } // Set the template of the L2PcInstance @@ -9882,7 +9882,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -10122,7 +10122,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10134,7 +10134,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogin(this), this); @@ -10619,7 +10619,7 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return false; } @@ -10761,7 +10761,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) @@ -10769,13 +10769,13 @@ public final class L2PcInstance extends L2Playable { if (!isOnline()) { - _log.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); + LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } setOnlineStatus(false, true); } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10787,7 +10787,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10799,7 +10799,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove combat flag @@ -10822,7 +10822,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10835,7 +10835,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10847,7 +10847,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Recommendations must be saved before task (timer) is canceled @@ -10857,7 +10857,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop the HP/MP/CP Regeneration task (scheduled tasks) try @@ -10866,7 +10866,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10875,7 +10875,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop crafting, if in progress @@ -10885,7 +10885,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Cancel Attak or Cast @@ -10895,7 +10895,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isChannelized()) @@ -10916,7 +10916,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // If a Party is in progress, leave it (and festival party) @@ -10928,7 +10928,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10963,7 +10963,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // returns pet to control item } @@ -10981,7 +10981,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11001,7 +11001,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11021,7 +11021,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove player from instance @@ -11034,7 +11034,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11044,7 +11044,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its inventory and remove them from the world @@ -11054,7 +11054,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its warehouse and remove them from the world @@ -11064,7 +11064,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (Config.WAREHOUSE_CACHE) { @@ -11077,7 +11077,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11086,7 +11086,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isCursedWeaponEquipped()) @@ -11097,7 +11097,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11145,7 +11145,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); } // Stop all passives and augment options @@ -11471,7 +11471,7 @@ public final class L2PcInstance extends L2Playable { if (killer == null) { - _log.warning(this + " called calculateShilensBreathDebuffLevel with killer null!"); + LOGGER.warning(this + " called calculateShilensBreathDebuffLevel with killer null!"); return; } @@ -11932,7 +11932,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); + LOGGER.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); } } } @@ -12061,7 +12061,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); } } @@ -12081,7 +12081,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -12230,7 +12230,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); } @@ -12251,7 +12251,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); } } @@ -12470,7 +12470,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); } } @@ -12567,7 +12567,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); + LOGGER.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); } } } @@ -12593,7 +12593,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); } } @@ -12842,12 +12842,12 @@ public final class L2PcInstance extends L2Playable if (nextLevel == -1) { - _log.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from player " + toString()); removeSkill(skill, true); // there is no lower skill } else { - _log.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } @@ -12993,7 +12993,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); } } @@ -13037,7 +13037,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); } } @@ -13057,7 +13057,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); } } @@ -13826,14 +13826,14 @@ public final class L2PcInstance extends L2Playable { sendMessage("The command " + command.substring(6) + " does not exist!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, getAccessLevel())) { sendMessage("You don't have the access rights to use this command!"); - _log.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); + LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 5718895451..ca24302555 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -576,7 +576,7 @@ public class L2PetInstance extends L2Summon final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -771,7 +771,7 @@ public class L2PetInstance extends L2Summon if (removedItem == null) { - _log.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); + LOGGER.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); } else { @@ -1059,7 +1059,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not store pet effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store pet effect data: ", e); } } @@ -1098,7 +1098,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { @@ -1404,7 +1404,7 @@ public class L2PetInstance extends L2Summon } else { - _log.warning("Pet control item null, for pet: " + toString()); + LOGGER.warning("Pet control item null, for pet: " + toString()); } super.setName(name); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 2c113f3992..fcd45fb1b0 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -376,7 +376,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store summon effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store summon effect data: ", e); } } @@ -442,7 +442,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index 23ca608434..2fcc796ffa 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -55,7 +55,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2VillageMasterInstance extends L2NpcInstance { - private static Logger _log = Logger.getLogger(L2VillageMasterInstance.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2VillageMasterInstance.class.getName()); public L2VillageMasterInstance(L2NpcTemplate template) { @@ -627,7 +627,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } catch (PatternSyntaxException e) { - _log.warning("ERROR: Wrong pattern for clan name!"); + LOGGER.warning("ERROR: Wrong pattern for clan name!"); pattern = Pattern.compile(".*"); } return pattern.matcher(name).matches(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java index b448f021a8..d2cd097234 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java @@ -93,7 +93,7 @@ public class PetStat extends SummonStat { if (getActiveChar() != null) { - _log.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); + LOGGER.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); } throw e; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index aaecadf5c5..222d29419e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp public class PlayableStat extends CharStat { - protected static final Logger _log = Logger.getLogger(PlayableStat.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PlayableStat.class.getName()); public PlayableStat(L2Playable activeChar) { @@ -195,7 +195,7 @@ public class PlayableStat extends CharStat { if (value < 0) { - _log.warning("wrong usage"); + LOGGER.warning("wrong usage"); return false; } final long currentSp = getSp(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index 352a7719ae..0ce091c546 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.stats.Stats; public class CharStatus { - protected static final Logger _log = Logger.getLogger(CharStatus.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(CharStatus.class.getName()); private final L2Character _activeChar; @@ -449,7 +449,7 @@ public class CharStatus } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java index 3fa6773fd2..1b1003f76d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc; */ public class RandomAnimationTask implements Runnable { - private static final Logger _log = Logger.getLogger(RandomAnimationTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RandomAnimationTask.class.getName()); private final L2Npc _npc; private boolean _stopTask; @@ -70,7 +70,7 @@ public class RandomAnimationTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); + LOGGER.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java index 39eaa5b37a..755ae87ebc 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction; */ public class TrapTask implements Runnable { - private static final Logger _log = Logger.getLogger(TrapTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TrapTask.class.getName()); private static final int TICK = 1000; // 1s private final L2TrapInstance _trap; @@ -65,7 +65,7 @@ public class TrapTask implements Runnable } catch (Exception e) { - _log.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); _trap.unSummon(); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java index 1801510a6b..a08fc73212 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.LeaveWorld; */ public class GameGuardCheckTask implements Runnable { - private static final Logger _log = Logger.getLogger(GameGuardCheckTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GameGuardCheckTask.class.getName()); private final L2PcInstance _player; @@ -47,7 +47,7 @@ public class GameGuardCheckTask implements Runnable if ((client != null) && !client.isAuthedGG() && _player.isOnline()) { AdminData.getInstance().broadcastMessageToGMs("Client " + client + " failed to reply GameGuard query and is being kicked!"); - _log.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); + LOGGER.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); client.close(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 23cfffc2bb..fc78d6a4db 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.Disconnection; */ public final class IllegalPlayerActionTask implements Runnable { - private static final Logger _log = Logger.getLogger("audit"); + private static final Logger LOGGER = Logger.getLogger("audit"); private final String _message; private final IllegalActionPunishmentType _punishment; @@ -74,7 +74,7 @@ public final class IllegalPlayerActionTask implements Runnable @Override public void run() { - _log.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); + LOGGER.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); AdminData.getInstance().broadcastMessageToGMs(_message); if (!_actor.isGM()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index 8b4bd27212..73c3219140 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PetFeedTask implements Runnable { - private static final Logger _log = Logger.getLogger(PetFeedTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PetFeedTask.class.getName()); private final L2PcInstance _player; @@ -99,7 +99,7 @@ public class PetFeedTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); + LOGGER.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/Announcement.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/Announcement.java index 3873f71d14..4e5aa84b0f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/Announcement.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/Announcement.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class Announcement implements IAnnouncement { - protected static final Logger _log = Logger.getLogger(Announcement.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Announcement.class.getName()); private static final String INSERT_QUERY = "INSERT INTO announcements (type, content, author) VALUES (?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE announcements SET type = ?, content = ?, author = ? WHERE id = ?"; @@ -125,7 +125,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -145,7 +145,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -162,7 +162,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java index f85c9affc0..a18af9fc50 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,7 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; - private static final Logger _log = Logger.getLogger(AnnouncementType.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) { @@ -40,7 +40,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); return NORMAL; } @@ -53,7 +53,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); return NORMAL; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index a47ba1a0a5..ebee3cd82c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -114,7 +114,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -137,7 +137,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/buylist/Product.java index 97571235ed..03b1a51b6b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; */ public final class Product { - private static final Logger _log = Logger.getLogger(Product.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Product.class.getName()); private final int _buyListId; private final L2Item _item; @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - _log.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index 8d2e52b55c..6eefb3679e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public final class ConditionPlayerGrade extends Condition { - protected static final Logger _log = Logger.getLogger(ConditionPlayerGrade.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ConditionPlayerGrade.class.getName()); // conditional values public static final int COND_NO_GRADE = 0x0001; public static final int COND_D_GRADE = 0x0002; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 90ac2108aa..805960c36b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public abstract class AbstractEffect { - protected static final Logger _log = Logger.getLogger(AbstractEffect.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEffect.class.getName()); private int _ticks; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index 6892d0798a..ce7a68dcc7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -56,7 +56,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class BlockCheckerEngine { - protected static final Logger _log = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -309,7 +309,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); + LOGGER.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); } } @@ -417,7 +417,7 @@ public final class BlockCheckerEngine // Wrong arena passed, stop event if (_arena == -1) { - _log.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); + LOGGER.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); return; } _isStarted = true; @@ -508,7 +508,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Spawn the block carrying girl @@ -530,8 +530,8 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } @@ -558,7 +558,7 @@ public final class BlockCheckerEngine { if (_spawn == null) { - _log.warning("HBCE: Block Carrying Girl is null"); + LOGGER.warning("HBCE: Block Carrying Girl is null"); return; } SpawnTable.getInstance().deleteSpawn(_spawn, false); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java index a6faf0b0df..4fa38d85d4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public final class Castle extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Castle.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Castle.class.getName()); private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); @@ -212,7 +212,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -232,7 +232,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; } @@ -542,7 +542,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } oldOwner.setCastleId(0); // Unset has castle flag for old owner for (L2PcInstance member : oldOwner.getOnlineMembers(0)) @@ -683,7 +683,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); } } @@ -704,7 +704,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); } } @@ -724,7 +724,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -801,7 +801,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); } } @@ -821,7 +821,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -848,7 +848,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); } } } @@ -891,7 +891,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -1042,7 +1042,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); } } @@ -1086,7 +1086,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -1110,7 +1110,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); } } final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(getResidenceId()).get(towerIndex); @@ -1135,7 +1135,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -1184,7 +1184,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); return; } spawn.setX(holder.getX()); @@ -1219,7 +1219,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } _castleSide = side; Broadcast.toAllOnlinePlayers(new ExCastleState(this)); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Couple.java index c31232e232..c40e7d454a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Couple.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class Couple { - private static final Logger _log = Logger.getLogger(Couple.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Couple.class.getName()); private int _Id = 0; private int _player1Id = 0; @@ -67,7 +67,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); } } @@ -99,7 +99,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); } } @@ -117,7 +117,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); } } @@ -131,7 +131,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Duel.java index d601203f8d..826a7beece 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class Duel { - protected static final Logger _log = Logger.getLogger(Duel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Duel.class.getName()); public static final int DUELSTATE_NODUEL = 0; public static final int DUELSTATE_DUELLING = 1; @@ -223,7 +223,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); } } } @@ -266,7 +266,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); } } } @@ -291,7 +291,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); } } } @@ -994,7 +994,7 @@ public class Duel { if ((player != _playerA) && (player != _playerB)) { - _log.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); + LOGGER.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); } if (_playerA == player) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java index 75ec9236b8..aaece02dae 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Fort extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Fort.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Fort.class.getName()); private final List _doors = new ArrayList<>(); private L2StaticObjectInstance _flagPole = null; @@ -227,7 +227,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Fort extends AbstractResidence { if (clan == null) { - _log.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); + LOGGER.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); return false; } @@ -396,7 +396,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } removeOwner(true); } @@ -496,7 +496,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); } } @@ -606,7 +606,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } @@ -627,7 +627,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); } } @@ -647,7 +647,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -744,7 +744,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -775,7 +775,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); } } @@ -844,7 +844,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -968,7 +968,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); } } } @@ -1008,7 +1008,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); } } @@ -1154,7 +1154,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1183,7 +1183,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1213,7 +1213,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1249,7 +1249,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 053af69e9d..80e02260d5 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class FortSiege implements Siegable { - protected static final Logger _log = Logger.getLogger(FortSiege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortSiege.class.getName()); // SQL private static final String DELETE_FORT_SIEGECLANS_BY_CLAN_ID = "DELETE FROM fortsiege_clans WHERE fort_id = ? AND clan_id = ?"; @@ -82,7 +82,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -169,12 +169,12 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); + LOGGER.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); } } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); } } } @@ -195,7 +195,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -218,7 +218,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -293,7 +293,7 @@ public class FortSiege implements Siegable getFort().setVisibleFlag(true); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -343,7 +343,7 @@ public class FortSiege implements Siegable announceToPlayer(sm); saveFortSiege(); - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -533,7 +533,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -689,7 +689,7 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); } } } @@ -816,7 +816,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); } } @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new FortSiege.ScheduleStartSiegeTask(60), 0); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); } } } @@ -1013,7 +1013,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1066,7 +1066,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1092,7 +1092,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); } } @@ -1120,7 +1120,7 @@ public class FortSiege implements Siegable catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/L2Event.java index be28d47897..dbdbdae0e9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/L2Event.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/L2Event.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class L2Event { - protected static final Logger _log = Logger.getLogger(L2Event.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2Event.class.getName()); public static EventState eventState = EventState.OFF; public static String _eventName = ""; public static String _eventCreator = ""; @@ -151,7 +151,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); } } } @@ -187,7 +187,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); } } @@ -308,7 +308,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); } } @@ -399,7 +399,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event participation, an error has occured."; } @@ -475,7 +475,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event, an error has occured."; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Siege.java index c3b017869d..d18783ec7d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class Siege implements Siegable { - protected static final Logger _log = Logger.getLogger(Siege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Siege.class.getName()); // typeId's public static final byte OWNER = -1; @@ -142,7 +142,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -215,7 +215,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -781,7 +781,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -798,7 +798,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); } } @@ -983,7 +983,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); } } @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - _log.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); loadSiegeClan(); @@ -1275,7 +1275,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1360,7 +1360,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1428,7 +1428,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); } } @@ -1482,7 +1482,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); } _controlTowerCount = _controlTowers.size(); } @@ -1506,7 +1506,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 28ff51de81..de9e909fa9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -162,7 +162,7 @@ import com.l2jmobius.gameserver.util.MinionList; */ public abstract class AbstractScript extends ManagedScript implements IEventTimerEvent, IEventTimerCancel { - protected static final Logger _log = Logger.getLogger(AbstractScript.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractScript.class.getName()); private final Map> _registeredIds = new ConcurrentHashMap<>(); private final Queue _listeners = new PriorityBlockingQueue<>(); private volatile TimerExecutor _timerExecutor; @@ -186,7 +186,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime public void onTimerEvent(String event, StatsSet params, L2Npc npc, L2PcInstance player) { - _log.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); + LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } public void onTimerCancel(String event, StatsSet params, L2Npc npc, L2PcInstance player) @@ -230,17 +230,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final EventType eventType = listener.value(); if (method.getParameterCount() != 1) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); continue; } else if (!eventType.isEventClass(method.getParameterTypes()[0])) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); continue; } else if (!eventType.isReturnClass(method.getReturnType())) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); continue; } @@ -276,7 +276,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final Range range = (Range) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -292,7 +292,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -307,12 +307,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final NpcLevelRange range = (NpcLevelRange) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -330,12 +330,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -392,7 +392,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -410,7 +410,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -500,7 +500,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -518,7 +518,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -537,7 +537,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -554,7 +554,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -597,7 +597,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -614,7 +614,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -634,7 +634,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -652,7 +652,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -672,7 +672,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -690,7 +690,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -710,7 +710,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -728,7 +728,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -1019,7 +1019,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1037,7 +1037,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1724,7 +1724,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } @@ -1844,7 +1844,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } } @@ -2217,7 +2217,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime if ((x == 0) && (y == 0)) { - _log.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); + LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); return null; } @@ -2259,7 +2259,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } catch (Exception e) { - _log.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); + LOGGER.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); } return null; @@ -3150,7 +3150,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (!door.isOpen()) { @@ -3168,7 +3168,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (door.isOpen()) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java index c25f5189f6..231cef15b4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public final class EventDispatcher { - private static final Logger _log = Logger.getLogger(EventDispatcher.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EventDispatcher.class.getName()); protected EventDispatcher() { @@ -83,7 +83,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -172,7 +172,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -237,7 +237,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java index 4b21e92c36..97dc1b1142 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class AnnotationEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(AnnotationEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnotationEventListener.class.getName()); private final Method _callback; public AnnotationEventListener(ListenersContainer container, EventType type, Method callback, Object owner, int priority) @@ -54,7 +54,7 @@ public class AnnotationEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java index 0d5b4a601c..56fb7b03ec 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class FunctionEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(FunctionEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FunctionEventListener.class.getName()); private final Function _callback; @SuppressWarnings("unchecked") @@ -50,7 +50,7 @@ public class FunctionEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index cb65209f93..1501c166e8 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public abstract class ItemContainer { - protected static final Logger _log = Logger.getLogger(ItemContainer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ItemContainer.class.getName()); protected final Map _items = new ConcurrentHashMap<>(); @@ -287,7 +287,7 @@ public abstract class ItemContainer final L2Item template = ItemTable.getInstance().getTemplate(itemId); if (template == null) { - _log.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); + LOGGER.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); return null; } @@ -702,7 +702,7 @@ public abstract class ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index cb2d9362ba..5bb5770412 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -139,7 +139,7 @@ public class Mail extends ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index 7fce82d4af..c7a3128aa9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; public class PcInventory extends Inventory { - private static final Logger _log = Logger.getLogger(PcInventory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PcInventory.class.getName()); private final L2PcInstance _owner; private L2ItemInstance _adena; @@ -761,7 +761,7 @@ public class PcInventory extends Inventory } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); } return paperdoll; } @@ -974,7 +974,7 @@ public class PcInventory extends Inventory { if ((type != EtcItemType.ARROW) && (type != EtcItemType.BOLT)) { - _log.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); + LOGGER.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java index 37e0216702..ded347d03a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java @@ -71,7 +71,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "addItem()", e); + LOGGER.log(Level.SEVERE, "addItem()", e); } } @@ -93,7 +93,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } _items.clear(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index a988fe1fec..c5a70ee9be 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.items.type.ItemType; */ public abstract class AbstractEnchantItem { - protected static final Logger _log = Logger.getLogger(AbstractEnchantItem.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); private static final ItemType[] ENCHANT_TYPES = new ItemType[] { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java index d4af9b02f5..2a7e5652dc 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.holders.RangeChanceHolder; */ public final class EnchantItemGroup { - private static final Logger _log = Logger.getLogger(EnchantItemGroup.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); private final List _chances = new ArrayList<>(); private final String _name; @@ -68,10 +68,10 @@ public final class EnchantItemGroup return holder.getChance(); } } - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); return _chances.get(_chances.size() - 1).getChance(); } - _log.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); return -1; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index f7595701a1..98cb998ee2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -142,14 +142,14 @@ public final class EnchantScroll extends AbstractEnchantItem { if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) { - _log.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); return -1; } final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); if (group == null) { - _log.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); return -1; } return group.getChance(enchantItem.getEnchantLevel()); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 076cfe435a..2ca4331a23 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -1281,7 +1281,7 @@ public final class L2ItemInstance extends L2Object */ public static class ScheduleConsumeManaTask implements Runnable { - private static final Logger _log = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); private final L2ItemInstance _shadowItem; public ScheduleConsumeManaTask(L2ItemInstance item) @@ -1302,7 +1302,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 7556af343a..46097d99e5 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public abstract class AbstractOlympiadGame { - protected static final Logger _log = Logger.getLogger(AbstractOlympiadGame.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractOlympiadGame.class.getName()); protected static final Logger _logResults = Logger.getLogger("olympiad"); protected static final String POINTS = "olympiad_points"; @@ -186,7 +186,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return false; } return true; @@ -287,7 +287,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -340,7 +340,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -387,7 +387,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "playerStatusBack()", e); + LOGGER.log(Level.WARNING, "playerStatusBack()", e); } } @@ -434,7 +434,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java index 6069b35ec8..714e479916 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OlympiadGameManager implements Runnable { - private static final Logger _log = Logger.getLogger(OlympiadGameManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlympiadGameManager.class.getName()); private static final int STADIUM_COUNT = 80; // TODO dynamic private volatile boolean _battleStarted = false; @@ -60,7 +60,7 @@ public class OlympiadGameManager implements Runnable _tasks.add(stadium); } - _log.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); + LOGGER.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); } public static OlympiadGameManager getInstance() @@ -188,7 +188,7 @@ public class OlympiadGameManager implements Runnable { OlympiadManager.getInstance().clearRegistered(); _battleStarted = false; - _log.info("Olympiad System: All current games finished."); + LOGGER.info("Olympiad System: All current games finished."); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 2108adfcb2..c82b326970 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -167,7 +167,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return false; } return result; @@ -388,7 +388,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (_playerTwo.isDefaulted()) @@ -415,7 +415,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (winside == 1) @@ -431,7 +431,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -536,7 +536,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -673,7 +673,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (SQLException e) { - _log.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); + LOGGER.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index d18e278286..8ef4db814e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class OlympiadGameTask implements Runnable { - protected static final Logger _log = Logger.getLogger(OlympiadGameTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(OlympiadGameTask.class.getName()); private static final int[] TELEPORT_TO_ARENA_TIMES = { @@ -163,7 +163,7 @@ public final class OlympiadGameTask implements Runnable { if ((game != null) && (_state != GameState.IDLE)) { - _log.warning("Attempt to overwrite non-finished game in state " + _state); + LOGGER.warning("Attempt to overwrite non-finished game in state " + _state); return; } @@ -352,14 +352,14 @@ public final class OlympiadGameTask implements Runnable case CLEANUP: case IDLE: { - _log.warning("Unable to return players back in town, exception: " + e.getMessage()); + LOGGER.warning("Unable to return players back in town, exception: " + e.getMessage()); _state = GameState.IDLE; _game = null; return; } } - _log.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); _state = GameState.GAME_STOPPED; ThreadPool.schedule(this, 1000); } @@ -417,7 +417,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -446,7 +446,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -463,7 +463,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; @@ -480,7 +480,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -489,7 +489,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -498,7 +498,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -507,7 +507,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -522,7 +522,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -531,7 +531,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -540,7 +540,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -549,7 +549,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -558,7 +558,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index d4720828f5..037b43e894 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; */ public class PunishmentTask implements Runnable { - protected static final Logger _log = Logger.getLogger(PunishmentTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PunishmentTask.class.getName()); private static final String INSERT_QUERY = "INSERT INTO punishments (`key`, `affect`, `type`, `expiration`, `reason`, `punishedBy`) VALUES (?, ?, ?, ?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE punishments SET expiration = ? WHERE id = ?"; @@ -203,7 +203,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); } } @@ -230,7 +230,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 495a0d648b..0a5994e0d5 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class LongTimeEvent extends Quest { - protected Logger _log = Logger.getLogger(getClass().getName()); + protected Logger LOGGER = Logger.getLogger(getClass().getName()); protected String _eventName; boolean _enableShrines = false; @@ -86,17 +86,17 @@ public class LongTimeEvent extends Quest if (_eventPeriod.isWithinRange(new Date())) { startEvent(); - _log.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); + LOGGER.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); } else if (_eventPeriod.getStartDate().after(new Date())) { final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); - _log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); + LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } else { - _log.info("Event " + _eventName + " has passed... Ignored "); + LOGGER.info("Event " + _eventName + " has passed... Ignored "); } } } @@ -179,19 +179,19 @@ public class LongTimeEvent extends Quest if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); continue; } if (minCount > maxCount) { - _log.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); continue; } if ((finalChance < 10000) || (finalChance > 1000000)) { - _log.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); continue; } @@ -199,7 +199,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); } } } @@ -221,7 +221,7 @@ public class LongTimeEvent extends Quest if (NpcData.getInstance().getTemplate(npcId) == null) { - _log.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); + LOGGER.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); continue; } @@ -229,7 +229,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java index 6add6b73be..0e2949595c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -85,7 +85,7 @@ import com.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class Quest extends AbstractScript implements IIdentifiable { - public static final Logger _log = Logger.getLogger(Quest.class.getName()); + public static final Logger LOGGER = Logger.getLogger(Quest.class.getName()); /** Map containing lists of timers from the name of the timer. */ private volatile Map> _questTimers = null; @@ -524,7 +524,7 @@ public class Quest extends AbstractScript implements IIdentifiable { showError(trigger.getActingPlayer(), e); } - _log.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); return; } if (trigger.getActingPlayer() != null) @@ -544,7 +544,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); } } @@ -559,7 +559,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); } } @@ -865,7 +865,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); } } @@ -934,7 +934,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); } } @@ -949,7 +949,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); } } @@ -964,7 +964,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); } } @@ -979,7 +979,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); } } @@ -996,7 +996,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); } return false; } @@ -1009,7 +1009,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); return; } } @@ -1514,10 +1514,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public boolean showError(L2PcInstance player, Throwable t) { - _log.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); + LOGGER.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); if (t.getMessage() == null) { - _log.warning(getClass().getSimpleName() + ": " + t.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + t.getMessage()); } if ((player != null) && player.getAccessLevel().isGm()) { @@ -1608,7 +1608,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - _log.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1639,7 +1639,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - _log.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); @@ -1657,7 +1657,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1681,7 +1681,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1704,7 +1704,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not update char quest:", e); + LOGGER.log(Level.WARNING, "could not update char quest:", e); } } @@ -1725,7 +1725,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Unable to delete char quest!", e); + LOGGER.log(Level.WARNING, "Unable to delete char quest!", e); } } @@ -1749,7 +1749,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete char quest:", e); + LOGGER.log(Level.WARNING, "could not delete char quest:", e); } } @@ -2805,7 +2805,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if ((id != 0) && (ItemTable.getInstance().getTemplate(id) == null)) { - _log.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); } } _questItemIds = items; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 23c0acc8d1..40aa1878fd 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.util.Util; */ public final class QuestState { - protected static final Logger _log = Logger.getLogger(QuestState.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestState.class.getName()); /** The name of the quest of this QuestState */ private final String _questName; @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - _log.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - _log.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 64f6afb219..4013de0733 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class QuestTimer { - protected static final Logger _log = Logger.getLogger(QuestTimer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestTimer.class.getName()); public class ScheduleTimerTask implements Runnable { @@ -48,7 +48,7 @@ public class QuestTimer } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java index 64f04389a2..1c7ac4a6ab 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance; */ public class L2ShuttleEngine implements Runnable { - private static final Logger _log = Logger.getLogger(L2ShuttleEngine.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2ShuttleEngine.class.getName()); private static final int DELAY = 15 * 1000; @@ -117,7 +117,7 @@ public class L2ShuttleEngine implements Runnable } catch (Exception e) { - _log.log(Level.INFO, e.getMessage(), e); + LOGGER.log(Level.INFO, e.getMessage(), e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java index 6148235551..19a1a61b20 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Skill implements IIdentifiable { - private static final Logger _log = Logger.getLogger(Skill.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Skill.class.getName()); /** Skill ID. */ private final int _id; @@ -295,7 +295,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); + LOGGER.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); } } } @@ -426,7 +426,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); + LOGGER.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); } } } @@ -1139,7 +1139,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); } } activeChar.sendMessage("Target type of skill " + this + " is not currently handled."); @@ -1168,7 +1168,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); } } activeChar.sendMessage("Target affect scope of skill " + this + " is not currently handled."); @@ -1196,7 +1196,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); } } else @@ -1608,7 +1608,7 @@ public final class Skill implements IIdentifiable } else { - _log.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); + LOGGER.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 66b9f7e4b2..8e607be078 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SkillChannelizer implements Runnable { - private static final Logger _log = Logger.getLogger(SkillChannelizer.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SkillChannelizer.class.getName()); private final L2Character _channelizer; private List _channelized; @@ -72,7 +72,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); + LOGGER.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); return; } @@ -86,7 +86,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (!isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); + LOGGER.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); return; } @@ -192,7 +192,7 @@ public class SkillChannelizer implements Runnable final Skill channeledSkill = SkillData.getInstance().getSkill(skill.getChannelingSkillId(), skillLevel); if (channeledSkill == null) { - _log.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); + LOGGER.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); _channelizer.abortCast(); return; } @@ -229,7 +229,7 @@ public class SkillChannelizer implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); + LOGGER.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java index 7d6f856c18..8b91fc77d2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class AccountVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(AccountVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AccountVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM account_gsdata WHERE account_name = ?"; @@ -64,7 +64,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); return false; } finally @@ -107,7 +107,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); return false; } finally @@ -134,7 +134,7 @@ public class AccountVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); return false; } return true; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java index 390e2f166a..50fcf2ab6f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ClanVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ClanVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM clan_variables WHERE clanId = ?"; @@ -64,7 +64,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -107,7 +107,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -134,7 +134,7 @@ public class ClanVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java index bcd7f557fd..c7ba2ff071 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ItemVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ItemVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM item_variables WHERE id = ?"; @@ -69,7 +69,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); + LOGGER.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); return false; } return true; @@ -93,7 +93,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -136,7 +136,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -163,7 +163,7 @@ public class ItemVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java index 999b4cdd64..85508e687b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class PlayerVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(PlayerVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PlayerVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM character_variables WHERE charId = ?"; @@ -90,7 +90,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); return false; } finally @@ -133,7 +133,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); return false; } finally @@ -160,7 +160,7 @@ public class PlayerVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); return false; } return true; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java index 8a54b645b0..adfcec2ca5 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java @@ -66,7 +66,7 @@ public abstract class L2ZoneRespawn extends L2ZoneType } default: { - _log.warning(getClass().getSimpleName() + ": Unknown location type: " + type); + LOGGER.warning(getClass().getSimpleName() + ": Unknown location type: " + type); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 3beea85891..a6790a61d9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public abstract class L2ZoneType extends ListenersContainer { - protected static final Logger _log = Logger.getLogger(L2ZoneType.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2ZoneType.class.getName()); private final int _id; protected L2ZoneForm _zone; @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - _log.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 043a66b6f4..33d3bb8723 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -113,7 +113,7 @@ public final class L2EffectZone extends L2ZoneType final String[] skillSplit = skill.split("-"); if (skillSplit.length != 2) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); } else { @@ -125,7 +125,7 @@ public final class L2EffectZone extends L2ZoneType { if (!skill.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/L2GameClient.java index 56940c6507..7cdbe1bb0a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -63,7 +63,7 @@ import io.netty.channel.ChannelHandlerContext; public final class L2GameClient extends ChannelInboundHandler { protected static final Logger LOGGER = Logger.getLogger(L2GameClient.class.getName()); - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private final int _objectId; @@ -111,13 +111,13 @@ public final class L2GameClient extends ChannelInboundHandler final InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); _addr = address.getAddress(); _channel = ctx.channel(); - LOG_ACCOUNTING.finer("Client Connected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Connected: " + ctx.channel()); } @Override public void channelInactive(ChannelHandlerContext ctx) { - LOG_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); LoginServerThread.getInstance().sendLogout(getAccountName()); IdFactory.getInstance().releaseId(getObjectId()); @@ -339,7 +339,7 @@ public final class L2GameClient extends ChannelInboundHandler } } - LOG_ACCOUNTING.info("Delete, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Delete, " + objectId + ", " + this); return CharacterDeleteFailType.NONE; } @@ -362,7 +362,7 @@ public final class L2GameClient extends ChannelInboundHandler LOGGER.log(Level.SEVERE, "Error restoring character.", e); } - LOG_ACCOUNTING.info("Restore, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Restore, " + objectId + ", " + this); } public static void deleteCharByObjId(int objid) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/NpcStringId.java index 90461ddaf1..2f70d1593b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/NpcStringId.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { - private static final Logger _log = Logger.getLogger(NpcStringId.class.getName()); + private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; private static Map VALUES = new HashMap<>(); @@ -37969,7 +37969,7 @@ public final class NpcStringId } catch (Exception e) { - _log.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); + LOGGER.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Action.java index f92d2c5e23..6c3399eea7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Action.java @@ -154,7 +154,7 @@ public final class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - _log.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); + LOGGER.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 3159a555e3..1ffd75d20c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -58,7 +58,7 @@ public final class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - _log.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +68,7 @@ public final class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - _log.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 2471b37509..969aea0360 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.util.Util; @SuppressWarnings("unused") public final class CharacterCreate implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cSdddddddddddd private String _name; @@ -124,7 +124,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - _log.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -132,7 +132,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - _log.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -140,7 +140,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairColor > 3) || (_hairColor < 0)) { - _log.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -252,7 +252,7 @@ public final class CharacterCreate implements IClientIncomingPacket initNewChar(client, newChar); - LOG_ACCOUNTING.info("Created new character, " + newChar + ", " + client); + LOGGER_ACCOUNTING.info("Created new character, " + newChar + ", " + client); } private static boolean isValidName(String text) @@ -308,7 +308,7 @@ public final class CharacterCreate implements IClientIncomingPacket final L2ItemInstance item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - _log.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index cd62eefdba..1dab2d81f8 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -75,7 +75,7 @@ public final class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error:", e); + LOGGER.log(Level.SEVERE, "Error:", e); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index c7b59f3d6d..3d0b8dfcb3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ServerClose; */ public class CharacterSelect implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cd private int _charSlot; @@ -175,7 +175,7 @@ public class CharacterSelect implements IClientIncomingPacket client.getActiveCharLock().unlock(); } - LOG_ACCOUNTING.info("Logged in, " + client); + LOGGER_ACCOUNTING.info("Logged in, " + client); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5c18755798..689f42e143 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public final class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = activeChar.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - _log.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } activeChar.stopMovie(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6c6b755605..040487891b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -142,7 +142,7 @@ public class EnterWorld implements IClientIncomingPacket final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { - _log.warning("EnterWorld failed! activeChar returned 'null'."); + LOGGER.warning("EnterWorld failed! activeChar returned 'null'."); Disconnection.of(client).defaultSequence(false); return; } @@ -173,7 +173,7 @@ public class EnterWorld implements IClientIncomingPacket // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) // { - // _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); + // LOGGER.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); // } if (Config.PVP_COLOR_SYSTEM_ENABLED && !Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 29a07243b9..7638c7332e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -43,9 +43,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("[T1:ExGetOnAirShip] x: " + _x); - _log.info("[T1:ExGetOnAirShip] y: " + _y); - _log.info("[T1:ExGetOnAirShip] z: " + _z); - _log.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + 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); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index 4f62846be3..c9f4c0b539 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index 472f1051b3..b0f55887ee 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -27,5 +27,5 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger _log = Logger.getLogger(IClientIncomingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java index 8b2f68f220..d29291657e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class Logout implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -55,7 +55,7 @@ public final class Logout implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 3a681a986e..e3a9140189 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -147,7 +147,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - _log.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -155,14 +155,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) { - _log.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - _log.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -190,7 +190,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - _log.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -355,7 +355,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -453,7 +453,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -616,7 +616,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c9e6a88cec..6d400a1191 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.KeyPacket; */ public final class ProtocolVersion implements IClientIncomingPacket { - private static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + private static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private int _version; @@ -51,7 +51,7 @@ public final class ProtocolVersion implements IClientIncomingPacket } else if (!Config.PROTOCOL_LIST.contains(_version)) { - LOG_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); + LOGGER_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); client.setProtocolOk(false); client.close(new KeyPacket(client.enableCrypt(), 0)); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a00277486a..9990a21411 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -106,7 +106,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 32000)) { Util.handleIllegalPlayerAction(activeChar, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - _log.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); return; } @@ -125,7 +125,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - _log.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -135,7 +135,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); return; } @@ -517,7 +517,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } default: { - _log.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index daaae05884..4feb5ae11d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -56,7 +56,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -80,7 +80,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - _log.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } @@ -90,11 +90,11 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); } else if (prevSkillLevel != (_level - 1)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index baddc853ee..b54bca60ed 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -93,7 +93,7 @@ public final class RequestActionUse implements IClientIncomingPacket if (!(Arrays.binarySearch(allowedActions, _actionId) >= 0)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); + LOGGER.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); return; } } @@ -143,7 +143,7 @@ public final class RequestActionUse implements IClientIncomingPacket } default: { - _log.warning(activeChar.getName() + ": unhandled action type " + _actionId); + LOGGER.warning(activeChar.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 01c8b0c67f..138c70f9d8 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -131,7 +131,7 @@ public final class RequestBlock implements IClientIncomingPacket } default: { - _log.info("Unknown 0xA9 block type: " + _type); + LOGGER.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index df1cc723fd..4662619a4a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -161,7 +161,7 @@ public final class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - _log.warning("ERROR, no price found .. wrong buylist ??"); + LOGGER.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index a85b1019cc..7621a7029e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -86,7 +86,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty bypass!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty bypass!"); Disconnection.of(client, activeChar).defaultSequence(false); return; } @@ -107,7 +107,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket bypassOriginId = activeChar.validateHtmlAction(_command); if (bypassOriginId == -1) { - _log.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); + LOGGER.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); return; } @@ -192,7 +192,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); } } else if (_command.startsWith("_match")) @@ -285,13 +285,13 @@ public final class RequestBypassToServer implements IClientIncomingPacket } else { - _log.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - _log.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); + LOGGER.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); if (activeChar.isGM()) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 8d17f67975..61b88962de 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -61,7 +61,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket if (activeChar == null) { - _log.finer("RequestCrystalizeItem: activeChar was null"); + LOGGER.finer("RequestCrystalizeItem: activeChar was null"); return; } @@ -90,7 +90,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((activeChar.getRace() != Race.DWARF) && (activeChar.getClassId().ordinal() != 117) && (activeChar.getClassId().ordinal() != 55)) { - _log.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); + LOGGER.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); } return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index f48efc3a6d..9805ae3e39 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -171,7 +171,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not delete pet objectid: ", e); + LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 2c89d4fd7e..33c87254a1 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -185,7 +185,7 @@ public final class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - _log.warning(msg); + LOGGER.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index ac44a0a77b..2bbdb8626a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -42,6 +42,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 27e73c4de3..94fc6eac8a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -74,7 +74,7 @@ public final class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - _log.warning("Wrong Cube Game Team ID: " + _team); + LOGGER.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index ca230610ed..ea96e75807 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -64,7 +64,7 @@ public final class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - _log.warning("Unknown Cube Game Answer ID: " + _answer); + LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index 2aac09d8a2..87679b1211 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -34,6 +34,6 @@ public final class RequestExFishRanking implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestExFishRanking"); + LOGGER.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 1690c6d2f0..412be1caa7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -87,7 +87,7 @@ public final class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 31e55b54f3..0937ce580d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -72,7 +72,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - _log.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 352bc99c12..c031e965ea 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -43,7 +43,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - _log.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); + LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); if (client.getActiveChar() == null) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index 8c3b8157b7..d480f5057e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -44,6 +44,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - _log.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + LOGGER.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index ffc9040acd..0feb646e91 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -79,7 +79,7 @@ public final class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index ee5433c9e0..186e2f91a4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -119,7 +119,7 @@ public final class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 431f1db994..0f0b002fed 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -72,7 +72,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 4055e9b188..016c2378d4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -52,7 +52,7 @@ public final class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - _log.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); } client.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 6950da9b0c..a9704d4032 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -50,7 +50,7 @@ public final class RequestHennaItemRemoveInfo implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 0e427d5138..7c62b7cd89 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -75,7 +75,7 @@ public final class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - _log.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); + LOGGER.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); client.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index d8a598fa60..53afe57b35 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -49,20 +49,20 @@ public final class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - _log.warning("Player " + actor.getName() + " sent empty html link!"); + LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - _log.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - _log.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 3d797b889a..c8a621359f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -50,7 +50,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (activeChar.getObjectId() != _objectId) { - _log.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + LOGGER.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 1f6b539929..cab42128f7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public final class RequestMagicSkillUse implements IClientIncomingPacket activeChar.sendPacket(ActionFailed.STATIC_PACKET); if (_magicId > 0) { - _log.warning("Skill Id " + _magicId + " not found in player: " + activeChar); + LOGGER.warning("Skill Id " + _magicId + " not found in player: " + activeChar); } return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 0ab61c25b8..11ed417b33 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -72,7 +72,7 @@ public final class RequestOustPledgeMember implements IClientIncomingPacket final L2ClanMember member = clan.getClanMember(_target); if (member == null) { - _log.warning("Target (" + _target + ") is not member of the clan"); + LOGGER.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayerInstance().isInCombat()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index b703480e20..b87741c610 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -37,6 +37,6 @@ public final class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestPCCafeCouponUse: S: " + _str); + LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index aa71b73eb6..05962263f7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -119,7 +119,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -168,7 +168,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -176,7 +176,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 9ef482c27c..57d27eec76 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -136,7 +136,7 @@ public final class RequestPetUseItem implements IClientIncomingPacket else { activeChar.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - _log.warning("No item handler registered for itemId: " + item.getId()); + LOGGER.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index deef71c1ba..29ab10a108 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -74,7 +74,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - _log.severe("Error while saving petition feedback"); + LOGGER.severe("Error while saving petition feedback"); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 7e97a40c3f..432d30d9aa 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -74,7 +74,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -153,7 +153,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket final L2MerchantInstance merchant = (target instanceof L2MerchantInstance) ? (L2MerchantInstance) target : null; if (merchant == null) { - _log.warning("Null merchant!"); + LOGGER.warning("Null merchant!"); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index b6f2892f96..a20bb3d197 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -160,7 +160,7 @@ public final class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - _log.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index d61109b205..d76415c39f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -144,7 +144,7 @@ public final class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9ab82245e8..01373d760d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -194,7 +194,7 @@ public final class RequestRefundItem implements IClientIncomingPacket final L2ItemInstance item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - _log.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); continue; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 8b253257c5..1a4ea38608 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack } else { - _log.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } activeChar.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 23c4edd13c..f8749dfd8b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class RequestRestart implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -58,7 +58,7 @@ public final class RequestRestart implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 7ba8a189b4..e08c984b59 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -91,7 +91,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else if (!activeChar.isDead()) { - _log.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); + LOGGER.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); return; } @@ -143,7 +143,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getHideoutId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CLANHALL); @@ -171,7 +171,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -194,7 +194,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getFortId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.FORTRESS); @@ -223,7 +223,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.SIEGEFLAG); @@ -233,7 +233,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if (!activeChar.isGM() && !activeChar.getInventory().haveItemForSelfResurrection()) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (activeChar.isGM() || activeChar.destroyItemByItemId("Feather", 10649, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13300, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13128, 1, activeChar, false)) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9cbb114e88..e53df987df 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -323,14 +323,14 @@ public final class RequestSendPost implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - _log.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final L2ItemInstance newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - _log.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 092a91fe40..5e2215c60a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -54,17 +54,17 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((activeChar == null) || (castle == null)) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != activeChar.getClanId())) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); return; } else if (!activeChar.isClanLeader()) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); return; } else if (!castle.getIsTimeRegistrationOver()) @@ -81,12 +81,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index a6beb4572f..53fd80604a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -109,7 +109,7 @@ public final class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - _log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); + LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -117,7 +117,7 @@ public final class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - _log.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); + LOGGER.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -224,7 +224,7 @@ public final class Say2 implements IClientIncomingPacket } else { - _log.info("No handler registered for ChatType: " + _type + " Player: " + client); + LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -271,7 +271,7 @@ public final class Say2 implements IClientIncomingPacket if (item == null) { - _log.info(client + " trying publish item which doesnt own! ID:" + id); + LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -279,7 +279,7 @@ public final class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - _log.info(client + " sent invalid publish item msg! ID:" + id); + LOGGER.info(client + " sent invalid publish item msg! ID:" + id); return false; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 84eccf9f7a..2255ca3502 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -67,14 +67,14 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket activeChar.sendMessage("The command " + command.substring(6) + " does not exists!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 60c0402b18..237686ac3b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -128,7 +128,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -175,7 +175,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -187,7 +187,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 9c76eb1086..dc8836ed4b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -167,13 +167,13 @@ public final class SendWareHouseWithDrawList implements IClientIncomingPacket final L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final L2ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java index 5999d7d02c..8ae98bd315 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -272,7 +272,7 @@ public final class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(activeChar, item, _ctrlPressed)) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java index 1441d46716..622d6d2d7f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java @@ -64,8 +64,8 @@ public class ValidatePosition implements IClientIncomingPacket if (Config.DEVELOPER) { - _log.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); - _log.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); + LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); + LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); } if ((_x == 0) && (_y == 0)) @@ -191,7 +191,7 @@ public class ValidatePosition implements IClientIncomingPacket { if (Config.DEVELOPER) { - _log.info(activeChar.getName() + ": Synchronizing position Server --> Client"); + LOGGER.info(activeChar.getName() + ": Synchronizing position Server --> Client"); } activeChar.sendPacket(new ValidateLocation(activeChar)); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 95cfb7da92..0e6644de0b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -57,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - _log.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - _log.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((activeChar.getAbilityPoints() == 0) || (activeChar.getAbilityPoints() == activeChar.getAbilityPointsUsed())) { - _log.warning("Player " + activeChar + " is trying to learn ability without ability points!"); + LOGGER.warning("Player " + activeChar + " is trying to learn ability without ability points!"); return; } @@ -115,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final L2SkillLearn learn = SkillTreesData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - _log.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -123,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - _log.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - _log.warning("Player " + activeChar + " is trying to learn " + skill + " without enough ability points spent!"); + LOGGER.warning("Player " + activeChar + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (activeChar.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - _log.warning("Player " + activeChar + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + LOGGER.warning("Player " + activeChar + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((activeChar.getAbilityPoints() - activeChar.getAbilityPointsUsed()) < points) { - _log.warning("Player " + activeChar + " is trying to learn ability without ability points!"); + LOGGER.warning("Player " + activeChar + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 414e817ffe..fde25d4736 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -95,7 +95,7 @@ public class RequestAlchemyConversion implements IClientIncomingPacket final AlchemyCraftData data = AlchemyData.getInstance().getCraftData(_skillId, _skillLevel); if (data == null) { - _log.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 8cf9b2f3b5..8cf139d7c4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -57,7 +57,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_durationType < 0) || (_durationType > 3)) { - _log.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 659b237448..5e0ad65f1a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -101,7 +101,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning(activeChar + ": tried to crystallize " + item.getItem()); + LOGGER.warning(activeChar + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 076d40a420..a2d7c3bba4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -102,7 +102,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); } } else diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index faeca65fce..03435f7f4d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -101,7 +101,7 @@ public final class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not del friend objectid: ", e); + LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 29a252aa5e..94715a15c1 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -94,7 +94,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index c51d4f158a..de2ad9cf73 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -77,7 +77,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - _log.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index a7553a343f..5d89208157 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -61,7 +61,7 @@ public final class RequestBRProductList implements IClientIncomingPacket } default: { - _log.warning(player + " send unhandled product list type: " + _type); + LOGGER.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index 50b48de960..7c1b5ab107 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -71,7 +71,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { activeChar.sendMessage("That zone is not supported yet!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); return; } @@ -79,7 +79,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { activeChar.sendMessage("This zone is not handled yet!!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index 4c9c106a52..b6ac83ea82 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -60,7 +60,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket activeChar.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - _log.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); + LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java index eb24a578fb..9d28cd837c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java @@ -29,7 +29,7 @@ import com.l2jmobius.commons.network.BaseSendablePacket; */ public class BlowFishKey extends BaseSendablePacket { - private static Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param blowfishKey @@ -48,7 +48,7 @@ public class BlowFishKey extends BaseSendablePacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index d7f5a56cb6..4b509229e8 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -75,7 +75,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - _log.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); _html = html.substring(0, 17200); } @@ -93,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - _log.warning("missing html page " + path); + LOGGER.warning("missing html page " + path); return false; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 16c17c043b..a06dff5ebc 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -134,7 +134,7 @@ public abstract class AbstractMessagePacket> // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - _log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 58bbb84eef..2538126f0a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { - private static Logger _log = Logger.getLogger(CharSelectionInfo.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); private final String _loginName; private final int _sessionId; private int _activeId; @@ -241,7 +241,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } return new CharSelectInfoPackage[0]; } @@ -266,7 +266,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); } } @@ -378,7 +378,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 36ef7cd289..1c046a085c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -46,7 +46,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 03c64d3f83..a90b288eb1 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -44,7 +44,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 0616962b58..6cedcdd459 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -55,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - _log.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + LOGGER.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_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 8b2fe9aa5e..ba2ae9f9f1 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger _log = Logger.getLogger(IClientOutgoingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); int[] PAPERDOLL_ORDER = new int[] { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index f21611bb50..d0f43d0ffe 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -56,7 +56,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - _log.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 6397e049ac..401b7e072c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -58,7 +58,7 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - _log.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); + LOGGER.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 44a9997fb2..562b2ccd31 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -78,7 +78,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - _log.warning("Null owner for castle: " + _castle.getName()); + LOGGER.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 1082f31974..77c787e1be 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -55,7 +55,7 @@ public final class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_activeChar.getActiveWarehouse() == null) { - _log.warning("error while sending withdraw request to: " + _activeChar.getName()); + LOGGER.warning("error while sending withdraw request to: " + _activeChar.getName()); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/DateRange.java index 3b8acae352..1a16f0bd49 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/DateRange.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; */ public class DateRange { - protected static final Logger _log = Logger.getLogger(DateRange.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(DateRange.class.getName()); private final Date _startDate, _endDate; public DateRange(Date from, Date to) @@ -47,7 +47,7 @@ public class DateRange } catch (ParseException e) { - _log.log(Level.WARNING, "Invalid Date Format.", e); + LOGGER.log(Level.WARNING, "Invalid Date Format.", e); } } return new DateRange(null, null); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/ScriptDocument.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/ScriptDocument.java index eacfe5baf8..672c90e094 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/ScriptDocument.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/ScriptDocument.java @@ -33,7 +33,7 @@ import org.xml.sax.SAXException; */ public class ScriptDocument { - private static final Logger _log = Logger.getLogger(ScriptDocument.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScriptDocument.class.getName()); private Document _document; private final String _name; @@ -57,17 +57,17 @@ public class ScriptDocument { x = sxe.getException(); } - _log.warning(getClass().getSimpleName() + ": " + x.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + x.getMessage()); } catch (ParserConfigurationException pce) { // Parser with specified options can't be built - _log.log(Level.WARNING, "", pce); + LOGGER.log(Level.WARNING, "", pce); } catch (IOException ioe) { // I/O error - _log.log(Level.WARNING, "", ioe); + LOGGER.log(Level.WARNING, "", ioe); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 1779779829..8344576a3e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SecondaryPasswordAuth { - private final Logger _log = Logger.getLogger(SecondaryPasswordAuth.class.getName()); + private final Logger LOGGER = Logger.getLogger(SecondaryPasswordAuth.class.getName()); private final L2GameClient _activeClient; private String _password; @@ -96,7 +96,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); } } @@ -104,7 +104,7 @@ public class SecondaryPasswordAuth { if (passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -127,7 +127,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing password.", e); + LOGGER.log(Level.SEVERE, "Error while writing password.", e); return false; } _password = password; @@ -147,7 +147,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing wrong attempts.", e); + LOGGER.log(Level.SEVERE, "Error while writing wrong attempts.", e); return false; } return true; @@ -157,7 +157,7 @@ public class SecondaryPasswordAuth { if (!passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -185,7 +185,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); return false; } @@ -210,7 +210,7 @@ public class SecondaryPasswordAuth { LoginServerThread.getInstance().sendTempBan(_activeClient.getAccountName(), _activeClient.getConnectionAddress().getHostAddress(), SecondaryAuthData.getInstance().getBanTime()); LoginServerThread.getInstance().sendMail(_activeClient.getAccountName(), "SATempBan", _activeClient.getConnectionAddress().getHostAddress(), Integer.toString(SecondaryAuthData.getInstance().getMaxAttempts()), Long.toString(SecondaryAuthData.getInstance().getBanTime()), SecondaryAuthData.getInstance().getRecoveryLink()); - _log.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); + LOGGER.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); insertWrongAttempt(0); _activeClient.close(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_BAN, SecondaryAuthData.getInstance().getMaxAttempts())); } @@ -258,11 +258,11 @@ public class SecondaryPasswordAuth } catch (NoSuchAlgorithmException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); } catch (UnsupportedEncodingException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Encoding"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Encoding"); } return null; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index 9f26c91ac6..49f8a70c08 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; */ public class AttackStanceTaskManager { - protected static final Logger _log = Logger.getLogger(AttackStanceTaskManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AttackStanceTaskManager.class.getName()); protected static final Map _attackStanceTasks = new ConcurrentHashMap<>(); @@ -132,7 +132,7 @@ public class AttackStanceTaskManager catch (Exception e) { // Unless caught here, players remain in attack positions. - _log.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Broadcast.java index 419eb6295a..dfaa95d5d0 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Broadcast.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.RelationChanged; */ public final class Broadcast { - private static Logger _log = Logger.getLogger(Broadcast.class.getName()); + private static Logger LOGGER = Logger.getLogger(Broadcast.class.getName()); /** * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character that have the Character targeted.
@@ -101,7 +101,7 @@ public final class Broadcast } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } }); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Evolve.java index 7fae394d24..66a22f62fd 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Evolve.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class Evolve { - protected static final Logger _log = Logger.getLogger(Evolve.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Evolve.class.getName()); public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) { @@ -287,7 +287,7 @@ public final class Evolve } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } @@ -314,7 +314,7 @@ public final class Evolve } catch (Throwable e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java index f005fca2ea..7c4f9c2185 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -40,7 +40,7 @@ public final class FloodProtectorAction /** * Logger */ - private static final Logger _log = Logger.getLogger(FloodProtectorAction.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectorAction.class.getName()); /** * Client for this instance of flood protector. */ @@ -94,7 +94,7 @@ public final class FloodProtectorAction if ((curTick < _nextGameTick) || _punishmentInProgress) { - if (_config.LOG_FLOODING && !_logged && _log.isLoggable(Level.WARNING)) + if (_config.LOG_FLOODING && !_logged && LOGGER.isLoggable(Level.WARNING)) { log(" called command ", command, " ~", String.valueOf((_config.FLOOD_PROTECTION_INTERVAL - (_nextGameTick - curTick)) * GameTimeController.MILLIS_IN_TICK), " ms after previous command"); _logged = true; @@ -124,7 +124,7 @@ public final class FloodProtectorAction return false; } - if ((_count.get() > 0) && _config.LOG_FLOODING && _log.isLoggable(Level.WARNING)) + if ((_count.get() > 0) && _config.LOG_FLOODING && LOGGER.isLoggable(Level.WARNING)) { log(" issued ", String.valueOf(_count), " extra requests within ~", String.valueOf(_config.FLOOD_PROTECTION_INTERVAL * GameTimeController.MILLIS_IN_TICK), " ms"); } @@ -142,7 +142,7 @@ public final class FloodProtectorAction { Disconnection.of(_client).defaultSequence(false); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log("kicked for flooding"); } @@ -154,7 +154,7 @@ public final class FloodProtectorAction private void banAccount() { PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -176,7 +176,7 @@ public final class FloodProtectorAction PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" jailed for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -238,6 +238,6 @@ public final class FloodProtectorAction Arrays.stream(lines).forEach(output::append); - _log.warning(output.toString()); + LOGGER.warning(output.toString()); } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/GMAudit.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/GMAudit.java index c2ee25069b..c2a5593953 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/GMAudit.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/GMAudit.java @@ -31,7 +31,7 @@ import com.l2jmobius.Config; */ public class GMAudit { - private static final Logger _log = Logger.getLogger(GMAudit.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GMAudit.class.getName()); static { new File("log/GMAudit").mkdirs(); @@ -61,7 +61,7 @@ public class GMAudit } catch (IOException e) { - _log.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); + LOGGER.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 7394f489e8..ecc40e644b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public final class OfflineTradeUtil { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private OfflineTradeUtil() { @@ -145,7 +145,7 @@ public final class OfflineTradeUtil } Disconnection.of(player).storeMe().close(false); - LOG_ACCOUNTING.info("Entering offline mode, " + client); + LOGGER_ACCOUNTING.info("Entering offline mode, " + client); return true; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/FloodProtectedListener.java index df39b38769..d046a0f65c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import com.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger _log = Logger.getLogger(FloodProtectedListener.class.getName()); + private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map _floodProtection = new ConcurrentHashMap<>(); private ServerSocket _serverSocket; @@ -70,7 +70,7 @@ public abstract class FloodProtectedListener extends Thread fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) { - _log.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); + LOGGER.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); } fConnection.isFlooding = true; continue; @@ -78,7 +78,7 @@ public abstract class FloodProtectedListener extends Thread if (fConnection.isFlooding) // if connection was flooding server but now passed the check { fConnection.isFlooding = false; - _log.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); + LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } fConnection.lastConnection = System.currentTimeMillis(); } @@ -102,7 +102,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException io) { - _log.log(Level.INFO, "", io); + LOGGER.log(Level.INFO, "", io); } break; } @@ -145,7 +145,7 @@ public abstract class FloodProtectedListener extends Thread } else { - _log.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); + LOGGER.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); } } @@ -157,7 +157,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java index 767e0b2326..78eadc9019 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters; */ public class GameServerThread extends Thread { - protected static final Logger _log = Logger.getLogger(GameServerThread.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GameServerThread.class.getName()); private final Socket _connection; private InputStream _in; private OutputStream _out; @@ -69,7 +69,7 @@ public class GameServerThread extends Thread _connectionIPAddress = _connection.getInetAddress().getHostAddress(); if (GameServerThread.isBannedGameserverIP(_connectionIPAddress)) { - _log.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); + LOGGER.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); forceClose(LoginServerFail.REASON_IP_BANNED); // ensure no further processing for this connection return; @@ -92,7 +92,7 @@ public class GameServerThread extends Thread if ((lengthHi < 0) || _connection.isClosed()) { - _log.finer("LoginServerThread: Login terminated the connection."); + LOGGER.finer("LoginServerThread: Login terminated the connection."); break; } @@ -110,7 +110,7 @@ public class GameServerThread extends Thread if (receivedBytes != (length - 2)) { - _log.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); + LOGGER.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); break; } @@ -119,7 +119,7 @@ public class GameServerThread extends Thread checksumOk = NewCrypt.verifyChecksum(data); if (!checksumOk) { - _log.warning("Incorrect packet checksum, closing connection (LS)"); + LOGGER.warning("Incorrect packet checksum, closing connection (LS)"); return; } @@ -130,14 +130,14 @@ public class GameServerThread extends Thread { final String serverName = getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"; final String msg = "GameServer " + serverName + ": Connection lost: " + e.getMessage(); - _log.info(msg); + LOGGER.info(msg); } finally { if (isAuthed()) { _gsi.setDown(); - _log.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); + LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); @@ -185,7 +185,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); + LOGGER.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); } } @@ -209,7 +209,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final ScrambledKeyPair pair = LoginController.getInstance().getScrambledRSAKeyPair(); _privateKey = (RSAPrivateKey) pair.getPrivateKey(); @@ -241,7 +241,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.severe("IOException while sending packet " + sl.getClass().getSimpleName()); + LOGGER.severe("IOException while sending packet " + sl.getClass().getSimpleName()); } } @@ -265,7 +265,7 @@ public class GameServerThread extends Thread */ public void setGameHosts(String[] hosts) { - _log.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); + LOGGER.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); _gsi.clearServerAddresses(); for (int i = 0; i < hosts.length; i += 2) @@ -276,13 +276,13 @@ public class GameServerThread extends Thread } catch (Exception e) { - _log.warning("Couldn't resolve hostname \"" + e + "\""); + LOGGER.warning("Couldn't resolve hostname \"" + e + "\""); } } for (String s : _gsi.getServerAddresses()) { - _log.info(s); + LOGGER.info(s); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/L2LoginServer.java index bad76dd97c..b87afbb356 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/L2LoginServer.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; */ public final class L2LoginServer { - private final Logger _log = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; private static L2LoginServer _instance; @@ -77,7 +77,7 @@ public final class L2LoginServer } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Load Config @@ -92,7 +92,7 @@ public final class L2LoginServer } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); System.exit(1); } @@ -104,11 +104,11 @@ public final class L2LoginServer { _gameServerListener = new GameServerListener(); _gameServerListener.start(); - _log.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); + LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); } catch (IOException e) { - _log.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); System.exit(1); } @@ -148,7 +148,7 @@ public final class L2LoginServer } catch (NumberFormatException nfe) { - _log.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); return; } } @@ -159,25 +159,25 @@ public final class L2LoginServer } catch (UnknownHostException e) { - _log.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); } }); //@formatter:on } catch (IOException e) { - _log.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); } - _log.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); + LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); } else { - _log.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); + LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); } if (Config.LOGIN_SERVER_SCHEDULE_RESTART) { - _log.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); + LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); _restartLoginServer = new LoginServerRestart(); _restartLoginServer.setDaemon(true); _restartLoginServer.start(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/LoginController.java index ff547092da..a896c7fd7a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/LoginController.java @@ -51,7 +51,7 @@ import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason public class LoginController { - protected static final Logger _log = Logger.getLogger(LoginController.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(LoginController.class.getName()); private static LoginController _instance; @@ -78,7 +78,7 @@ public class LoginController private LoginController() throws GeneralSecurityException { - _log.info("Loading LoginController..."); + LOGGER.info("Loading LoginController..."); _keyPairs = new ScrambledKeyPair[10]; _blowfishKeyGenerator = KeyGenerator.getInstance("Blowfish"); @@ -91,7 +91,7 @@ public class LoginController _keyPairs[i] = new ScrambledKeyPair(rsaKeyPairGenerator.generateKeyPair()); } - _log.info("Cached 10 KeyPairs for RSA communication."); + LOGGER.info("Cached 10 KeyPairs for RSA communication."); final Thread purge = new PurgeThread(); purge.setDaemon(true); @@ -156,7 +156,7 @@ public class LoginController addBanForAddress(addr, Config.LOGIN_BLOCK_AFTER_BAN * 1000); // we need to clear the failed login attempts here, so after the ip ban is over the client has another 5 attempts clearFailedLoginAttemps(addr); - _log.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); + LOGGER.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); } } @@ -218,16 +218,16 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); return null; } - _log.info("Auto created account '" + login + "'."); + LOGGER.info("Auto created account '" + login + "'."); return retriveAccountInfo(addr, login, password, false); } catch (Exception e) { - _log.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); return null; } } @@ -301,7 +301,7 @@ public class LoginController if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); - _log.info("Removed expired ip address ban " + address.getHostAddress() + "."); + LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); return false; } return true; @@ -414,7 +414,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); } } return loginOk; @@ -433,7 +433,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); } } @@ -452,7 +452,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); } } @@ -532,13 +532,13 @@ public class LoginController { if (!ipWhiteList.isEmpty() && !ipWhiteList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); return false; } if (!ipBlackList.isEmpty() && ipBlackList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); return false; } } @@ -558,7 +558,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not finish login process!", e); + LOGGER.log(Level.WARNING, "Could not finish login process!", e); return false; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java index 83ad61827b..bfa7e9dc02 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class L2JGameServerPacketHandler { - protected static Logger _log = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); + protected static Logger LOGGER = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); public enum GameServerState { @@ -65,7 +65,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -83,7 +83,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -146,7 +146,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2LoginClient.java index c4f45ea59b..da20164f21 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -46,7 +46,7 @@ import io.netty.channel.ChannelHandlerContext; */ public final class L2LoginClient extends ChannelInboundHandler { - private static final Logger _log = Logger.getLogger(L2LoginClient.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2LoginClient.class.getName()); // Crypt private final ScrambledKeyPair _scrambledPair; @@ -105,7 +105,7 @@ public final class L2LoginClient extends ChannelInboundHandler } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java index 1cd1aceac3..e48d751a7a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java @@ -46,7 +46,7 @@ import com.l2jmobius.loginserver.network.serverpackets.ServerList; */ public class RequestAuthLogin implements IIncomingPacket { - private static Logger _log = Logger.getLogger(RequestAuthLogin.class.getName()); + private static Logger LOGGER = Logger.getLogger(RequestAuthLogin.class.getName()); private final byte[] _raw1 = new byte[128]; private final byte[] _raw2 = new byte[128]; @@ -89,7 +89,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (GeneralSecurityException e) { - _log.log(Level.INFO, "", e); + LOGGER.log(Level.INFO, "", e); return; } @@ -108,7 +108,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java index 6abfe18518..a68b2053a7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java @@ -32,7 +32,7 @@ import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerSt */ public class BlowFishKey extends BaseRecievePacket { - protected static final Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param decrypt @@ -67,7 +67,7 @@ public class BlowFishKey extends BaseRecievePacket } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java index 03ff8df8d3..4e0c492ffa 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java @@ -27,7 +27,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class ChangeAccessLevel extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangeAccessLevel.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangeAccessLevel.class.getName()); /** * @param decrypt @@ -40,6 +40,6 @@ public class ChangeAccessLevel extends BaseRecievePacket final String account = readS(); LoginController.getInstance().setAccountAccessLevel(account, level); - _log.info("Changed " + account + " access level to " + level); + LOGGER.info("Changed " + account + " access level to " + level); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java index d4c10be532..69ba99271d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java @@ -35,7 +35,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ChangePassword extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangePassword.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangePassword.class.getName()); private static GameServerThread gst = null; public ChangePassword(byte[] decrypt) @@ -103,7 +103,7 @@ public class ChangePassword extends BaseRecievePacket passUpdated = ps.executeUpdate(); } - _log.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); + LOGGER.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); if (passUpdated > 0) { gst.ChangePasswordResponse((byte) 1, characterName, "You have successfully changed your password!"); @@ -120,7 +120,7 @@ public class ChangePassword extends BaseRecievePacket } catch (Exception e) { - _log.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); + LOGGER.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java index 2154becbb5..153a4cd86d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class GameServerAuth extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(GameServerAuth.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GameServerAuth.class.getName()); GameServerThread _server; private final byte[] _hexId; private final int _desiredId; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java index 194d82d565..baa6528090 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerLogout extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerLogout.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerLogout.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java index 69c263628b..542848f6e6 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class PlayerTracert extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerTracert.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerTracert.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java index 1a76467686..f9a24a80d8 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java @@ -31,7 +31,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class RequestTempBan extends BaseRecievePacket { - private static final Logger _log = Logger.getLogger(RequestTempBan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RequestTempBan.class.getName()); private final String _accountName; @SuppressWarnings("unused") @@ -69,7 +69,7 @@ public class RequestTempBan extends BaseRecievePacket } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } try diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java index 6c7aed04d5..155d19688d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java @@ -28,7 +28,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ServerStatus extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ServerStatus.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ServerStatus.class.getName()); public static final int SERVER_LIST_STATUS = 0x01; public static final int SERVER_TYPE = 0x02; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java index cc2a6c0c2f..2a71996141 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -61,7 +61,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; */ public final class ServerList implements IOutgoingPacket { - protected static final Logger _log = Logger.getLogger(ServerList.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ServerList.class.getName()); private final List _servers; private final int _lastServer; @@ -89,7 +89,7 @@ public final class ServerList implements IOutgoingPacket } catch (UnknownHostException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); _ip = new byte[4]; _ip[0] = 127; _ip[1] = 0; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java index 593e01a15d..887e4f715c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; */ public class IPv4Filter implements Runnable { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final HashMap _ipFloodMap; private static final long SLEEP_TIME = 5000; @@ -69,7 +69,7 @@ public class IPv4Filter implements Runnable final InetAddress addr = sc.socket().getInetAddress(); if (!(addr instanceof Inet4Address)) { - _log.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); + LOGGER.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/AbstractNpcAI.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/AbstractNpcAI.java index 12e345f842..5647db4178 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/AbstractNpcAI.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/AbstractNpcAI.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class AbstractNpcAI extends Quest { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); public AbstractNpcAI() { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java index 1f8241ae42..d475493c5c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java @@ -76,7 +76,7 @@ public final class CrumaTower extends AbstractNpcAI } catch (Exception e) { - _log.warning("Invalid location for Cruma Tower teleport device."); + LOGGER.warning("Invalid location for Cruma Tower teleport device."); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java index b21c9b9df7..a1916fbe26 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java @@ -119,7 +119,7 @@ public final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - _log.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); + LOGGER.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); return null; } final int skillId = getSkillIdByNpcId(npc.getId()); @@ -144,7 +144,7 @@ public final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - _log.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); + LOGGER.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); return null; } final int skillId = getSkillIdByNpcId(npc.getId()); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 23514e5981..e86278e0e3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -135,7 +135,7 @@ public final class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000L; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000L, cycle); - _log.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index c56b9cd6e2..47ca8563c0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -303,7 +303,7 @@ public final class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - _log.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } @@ -368,7 +368,7 @@ public final class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - _log.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java index 1f44492048..c42b35c884 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java @@ -196,7 +196,7 @@ public class EnchantedMegaliths extends AbstractNpcAI private void updateMegalithStage() { GlobalVariablesManager.getInstance().set(HB_MEGALITH_STAGE, stage); - _log.info("[Hellbound] - Enchanted Megaliths stage: " + stage); + LOGGER.info("[Hellbound] - Enchanted Megaliths stage: " + stage); switch (stage) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index e67e5ea74d..78377b5546 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -57,6 +58,8 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets; */ public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName()); + // NPCs private static final int CONQUEROR_MANAGER = 31921; private static final int EMPEROR_MANAGER = 31922; @@ -678,7 +681,7 @@ public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReade { ROOM_SPAWN_DATA.clear(); parseDatapackFile("data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.xml"); - _log.info("[Four Sepulchers] Loaded " + ROOM_SPAWN_DATA.size() + " spawn zones data."); + LOGGER.info("[Four Sepulchers] Loaded " + ROOM_SPAWN_DATA.size() + " spawn zones data."); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index d0e679a7d6..e428ba8107 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -319,7 +319,7 @@ public final class Raina extends AbstractNpcAI if (cType == null) { - _log.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); + LOGGER.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); } final StringBuilder sb = new StringBuilder(); @@ -404,7 +404,7 @@ public final class Raina extends AbstractNpcAI if (cType == null) { - _log.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); + LOGGER.warning(getClass().getSimpleName() + ": Cannot parse CategoryType, event: " + event); } final StringBuilder sb = new StringBuilder(); @@ -894,7 +894,7 @@ public final class Raina extends AbstractNpcAI final String text = getHtm(player.getHtmlPrefix(), fileName); if (text == null) { - _log.info("Cannot find HTML file for " + Raina.class.getSimpleName() + " AI: " + fileName); + LOGGER.info("Cannot find HTML file for " + Raina.class.getSimpleName() + " AI: " + fileName); return null; } html.setHtml(text); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 1f39611ed2..bd2ea79b44 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -628,7 +628,7 @@ public final class Antharas extends AbstractNpcAI { if (!zone.isCharacterInZone(attacker) || (getStatus() != IN_FIGHT)) { - _log.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); attacker.teleToLocation(80464, 152294, -3534); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 33344e3f16..ef75b87d78 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -271,12 +271,12 @@ public class Lindvior extends AbstractNpcAI if (!_zoneLair.isInsideZone(attacker)) { attacker.doDie(null); - _log.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " out of the boss zone!"); + LOGGER.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " out of the boss zone!"); } if (!_zoneLair.isInsideZone(npc)) { npc.teleToLocation(CENTER_LOCATION, true); - _log.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " wich is out of the boss zone!"); + LOGGER.warning(getName() + ": Character: " + attacker.getName() + " attacked: " + npc.getName() + " wich is out of the boss zone!"); } double percent = ((npc.getCurrentHp() - damage) / npc.getMaxHp()) * 100; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index fbe2297935..ff6ffbd3a9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -314,7 +314,7 @@ public final class Sailren extends AbstractNpcAI { if (STATUS == Status.IN_FIGHT) { - _log.info(getClass().getSimpleName() + ": Script is being unloaded while Sailren is active, clearing zone."); + LOGGER.info(getClass().getSimpleName() + ": Script is being unloaded while Sailren is active, clearing zone."); notifyEvent("TIME_OUT", null, null); } return super.unload(removeFromList); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index 41c7968623..202e22b1f3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -67,6 +68,8 @@ import instances.AbstractInstance; */ public final class Stage1 extends AbstractInstance implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(Stage1.class.getName()); + protected static class SODSpawn { public boolean isZone = false; @@ -207,7 +210,7 @@ public final class Stage1 extends AbstractInstance implements IGameXmlReader public void load() { parseDatapackFile("data/scripts/ai/bosses/Tiat/SeedOfDestruction.xml"); - _log.info("[Seed of Destruction] Loaded " + _spawnZoneList.size() + " spawn zones data."); + LOGGER.info("[Seed of Destruction] Loaded " + _spawnZoneList.size() + " spawn zones data."); } @Override @@ -346,7 +349,7 @@ public final class Stage1 extends AbstractInstance implements IGameXmlReader } else { - _log.info("[Seed of Destruction] Missing zone: " + spw.zone); + LOGGER.info("[Seed of Destruction] Missing zone: " + spw.zone); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java index 1fc5df6996..92ef8f9f25 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java @@ -150,7 +150,7 @@ public final class CastleAmbassador extends AbstractNpcAI if (fort == null) { npc.deleteMe(); - _log.warning("Spawned: " + npc + " location: " + npc.getLocation() + " without fort!"); + LOGGER.warning("Spawned: " + npc + " location: " + npc.getLocation() + " without fort!"); return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 45780446af..509ac8cb3d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1245,7 +1245,7 @@ public final class CastleChamberlain extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index 749f577141..e0f4f546e6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public final class ManorManager extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 9e65f90f3a..dc61f5b704 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -73,7 +73,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler "watchmatch", "arenachange" }; - private static final Logger _LOG = Logger.getLogger(OlyManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlyManager.class.getName()); private OlyManager() { @@ -364,7 +364,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler final List spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns(); if (spectatorSpawns.isEmpty()) { - _LOG.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); + LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); @@ -375,7 +375,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler } catch (Exception e) { - _LOG.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 4ca3d1df97..813358bd0c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -88,7 +88,7 @@ public final class Elpies extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started because custom NPC table is disabled!"); + LOGGER.info(getName() + ": Event can't be started because custom NPC table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index e8d253c2c9..bd418adefc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -95,7 +95,7 @@ public final class Rabbits extends Event // Check starting conditions if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPCs are disabled!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java index 19f2f42bae..7756d0d55e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java @@ -121,7 +121,7 @@ public final class Race extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom npc table is disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom npc table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/listeners/ListenerTest.java index 73b858e854..59dcb31683 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -63,7 +63,7 @@ public class ListenerTest extends AbstractNpcAI // Manual listener registration Containers.Global().addListener(new ConsumerEventListener(Containers.Global(), EventType.ON_PLAYER_DLG_ANSWER, (OnPlayerDlgAnswer event) -> { - _log.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); }, this)); } @@ -73,7 +73,7 @@ public class ListenerTest extends AbstractNpcAI */ private void onAttackableAttack(OnAttackableAttack event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); } /** @@ -88,7 +88,7 @@ public class ListenerTest extends AbstractNpcAI @Id(22228) private void onCreatureKill(OnCreatureDeath event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); } /** @@ -101,7 +101,7 @@ public class ListenerTest extends AbstractNpcAI @Range(from = 1, to = 9) private void onSiegeStart(OnCastleSiegeStart event) { - _log.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); + LOGGER.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); } /** @@ -114,7 +114,7 @@ public class ListenerTest extends AbstractNpcAI @Id(5575) private void onItemCreate(OnItemCreate event) { - _log.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); + LOGGER.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); } /** @@ -152,7 +152,7 @@ public class ListenerTest extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void OnPlayerLogin(OnPlayerLogin event) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); } /** @@ -170,7 +170,7 @@ public class ListenerTest extends AbstractNpcAI { if (event.getTarget().isGM()) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); return new TerminateReturn(true, true, true); } return null; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java index 15619c6ee5..8ff587ff17 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java @@ -341,7 +341,7 @@ import handlers.voicedcommandhandlers.StatsVCmd; */ public class MasterHandler { - private static final Logger _log = Logger.getLogger(MasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MasterHandler.class.getName()); private static final IHandler[] LOAD_INSTANCES = { @@ -680,7 +680,7 @@ public class MasterHandler public static void main(String[] args) { - _log.info("Loading Handlers..."); + LOGGER.info("Loading Handlers..."); final Map, Method> registerHandlerMethods = new HashMap<>(); for (IHandler loadInstance : LOAD_INSTANCES) @@ -697,7 +697,7 @@ public class MasterHandler registerHandlerMethods.entrySet().stream().filter(e -> e.getValue() == null).forEach(e -> { - _log.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); + LOGGER.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); }); for (Class classes[] : HANDLERS) @@ -722,7 +722,7 @@ public class MasterHandler } catch (Exception e) { - _log.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); + LOGGER.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); continue; } } @@ -759,9 +759,9 @@ public class MasterHandler for (IHandler loadInstance : LOAD_INSTANCES) { - _log.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); + LOGGER.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); } - _log.info("Handlers Loaded..."); + LOGGER.info("Handlers Loaded..."); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java index 2c0368fa04..6239aa2af9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java @@ -34,7 +34,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target; if (staticObject.getType() < 0) { - _log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); + LOGGER.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); } // Check if the L2PcInstance already target the L2NpcInstance diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7b78de63fe..1ead5e9548 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminAdmin implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminAdmin.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminAdmin.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -121,7 +121,7 @@ public class AdminAdmin implements IAdminCommandHandler } catch (Exception e) { - _log.warning("An error occured while ending olympiad: " + e); + LOGGER.warning("An error occured while ending olympiad: " + e); } activeChar.sendMessage("Heroes formed."); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c517e187f2..ae58296f38 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.UserInfo; */ public class AdminEditChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEditChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEditChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -218,7 +218,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set reputation error: " + e); + LOGGER.warning("Set reputation error: " + e); } activeChar.sendMessage("Usage: //setreputation "); } @@ -261,7 +261,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pk error: " + e); + LOGGER.warning("Set pk error: " + e); } activeChar.sendMessage("Usage: //setpk "); } @@ -291,7 +291,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pvp error: " + e); + LOGGER.warning("Set pvp error: " + e); } activeChar.sendMessage("Usage: //setpvp "); } @@ -321,7 +321,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set Fame error: " + e); + LOGGER.warning("Set Fame error: " + e); } activeChar.sendMessage("Usage: //setfame "); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 1634710c12..2de1bf7bd5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; */ public class AdminEnchant implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEnchant.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEnchant.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -146,7 +146,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a new enchant value."); } @@ -154,7 +154,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a valid new enchant value."); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index 5acf20c5b6..1da9a18c9d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminHeal implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_heal" @@ -57,7 +57,7 @@ public class AdminHeal implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Heal error: " + e); + LOGGER.warning("Heal error: " + e); } activeChar.sendMessage("Incorrect target/radius specified."); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index 549035d177..5ab19d4b39 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminMenu implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminMenu.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminMenu.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -112,7 +112,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_recall_clan_menu")) @@ -141,7 +141,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_goto_char_menu")) @@ -190,7 +190,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -207,7 +207,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5b95022983..cd89f2cc84 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminPunishment implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPunishment.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPunishment.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -86,7 +86,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); } } else @@ -149,7 +149,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); } break; } @@ -186,7 +186,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); } break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java index 934e877d84..764ab77c25 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminRepairChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRepairChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRepairChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -101,7 +101,7 @@ public class AdminRepairChar implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "could not repair char:", e); + LOGGER.log(Level.WARNING, "could not repair char:", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java index dfd8ab322b..52c768b06a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList; */ public class AdminShop implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShop.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShop.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -106,7 +106,7 @@ public class AdminShop implements IAdminCommandHandler } catch (Exception e) { - _log.warning("admin buylist failed:" + command); + LOGGER.warning("admin buylist failed:" + command); } final ProductList buyList = BuyListData.getInstance().getBuyList(val); @@ -117,7 +117,7 @@ public class AdminShop implements IAdminCommandHandler } else { - _log.warning("no buylist with id:" + val); + LOGGER.warning("no buylist with id:" + val); activeChar.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index a569d1fca6..780c3b0088 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.QuestList; */ public class AdminShowQuests implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShowQuests.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShowQuests.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -313,7 +313,7 @@ public class AdminShowQuests implements IAdminCommandHandler catch (Exception e) { actor.sendMessage("There was an error."); - _log.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java index ea51fdd106..93293c80e2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class AdminSkill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminSkill.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -526,7 +526,7 @@ public class AdminSkill implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } if (skill != null) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java index bf52975d48..603c953427 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class AdminSpawn implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSpawn.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -377,17 +377,17 @@ public class AdminSpawn implements IAdminCommandHandler default: case 0: { - _log.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); + LOGGER.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); break; } case 1: { - _log.info(""); + LOGGER.info(""); break; } case 2: { - _log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); + LOGGER.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java index 880aba40c1..a818e7f3d3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminSummon implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSummon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName()); public static final String[] ADMIN_COMMANDS = { @@ -69,7 +69,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -81,7 +81,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index a088b5f7f0..27bcfe9dd8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -50,7 +50,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminTeleport implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminTeleport.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminTeleport.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -525,7 +525,7 @@ public class AdminTeleport implements IAdminCommandHandler if (template1 == null) { activeChar.sendMessage("Incorrect monster template."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); return; } @@ -533,7 +533,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect monster spawn."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); return; } final int respawnTime = spawn.getRespawnDelay() / 1000; @@ -575,7 +575,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect raid spawn."); - _log.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); return; } DBSpawnManager.getInstance().deleteSpawn(spawn, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java index a02258ac82..6661cf897c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminUnblockIp implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminUnblockIp.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminUnblockIp.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -68,7 +68,7 @@ public class AdminUnblockIp implements IAdminCommandHandler private boolean unblockIp(String ipAddress, L2PcInstance activeChar) { // LoginServerThread.getInstance().unBlockip(ipAddress); - _log.warning("IP removed by GM " + activeChar.getName()); + LOGGER.warning("IP removed by GM " + activeChar.getName()); return true; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index d5baa52a73..fd68914b26 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -64,7 +64,7 @@ import ai.AbstractNpcAI; */ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPathNode.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPathNode.class.getName()); private final Map _zones = new ConcurrentHashMap<>(); private static final String[] COMMANDS = @@ -484,7 +484,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler catch (Exception e) { activeChar.sendMessage("Failed writing the dump: " + e.getMessage()); - _log.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Augment.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Augment.java index 6f3cdd671a..015cb20ce8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Augment.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Augment.java @@ -57,7 +57,7 @@ public class Augment implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Buy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Buy.java index dedd804298..5084dc1239 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Buy.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Buy.java @@ -54,7 +54,7 @@ public class Buy implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 77244e8a99..b937970ce0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -112,7 +112,7 @@ public class ClanWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } } return false; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 383b2ac65a..648a840357 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -54,7 +54,7 @@ public class EventEngine implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 5bb42fb02d..2cc2c9cd2e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -121,7 +121,7 @@ public class ItemAuctionLink implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 1ee7660160..fc06d1b5ea 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -35,13 +35,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty link html!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - _log.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java index 15c9a87b30..bd019c6c2b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java @@ -59,7 +59,7 @@ public class Multisell implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 27bbae841c..8d2b77c311 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -62,7 +62,7 @@ public class NpcViewMod implements IBypassHandler if (!st.hasMoreTokens()) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -101,7 +101,7 @@ public class NpcViewMod implements IBypassHandler { if (st.countTokens() < 2) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -124,7 +124,7 @@ public class NpcViewMod implements IBypassHandler } catch (IllegalArgumentException e) { - _log.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); + LOGGER.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); return false; } break; @@ -571,7 +571,7 @@ public class NpcViewMod implements IBypassHandler String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/DropList.htm"); if (html == null) { - _log.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); + LOGGER.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); return; } html = html.replaceAll("%name%", npc.getName()); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 5ec5c94594..2f52504410 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -113,7 +113,7 @@ public class Observation implements IBypassHandler } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java index 6c16720329..0597ff6ab7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java @@ -66,7 +66,7 @@ public class PlayerHelp implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index d6c31d5495..59491ae669 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -67,7 +67,7 @@ public class PrivateWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 40de431ce5..fd1fe934bd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -63,7 +63,7 @@ public class Wear implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } @@ -73,7 +73,7 @@ public class Wear implements IBypassHandler final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index faa4b3ef97..d74fd3a648 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -39,7 +39,7 @@ public final class AttackTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": this effect must have parameters!"); + LOGGER.warning(getClass().getSimpleName() + ": this effect must have parameters!"); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 675e1023d2..3b0c1fb514 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -74,7 +74,7 @@ public final class CallSkill extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 924b08d8f7..b582a0e29e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -66,7 +66,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } return skill.isToggle(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 36bed01887..9b3af7d06a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -39,7 +39,7 @@ public final class DefenceTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); return; } @@ -57,11 +57,11 @@ public final class DefenceTrait extends AbstractEffect } catch (NumberFormatException e) { - _log.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); + LOGGER.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); + LOGGER.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index b6d50cd89c..8fb26ea974 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -48,7 +48,7 @@ public final class Disarmor extends AbstractEffect _slot = ItemTable.SLOTS.getOrDefault(slot, L2Item.SLOT_NONE); if (_slot == L2Item.SLOT_NONE) { - _log.severe("Unknown bodypart slot for effect: " + slot); + LOGGER.severe("Unknown bodypart slot for effect: " + slot); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index adf474fe77..dbc72f8b13 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -59,7 +59,7 @@ public final class Restoration extends AbstractEffect if ((_itemId <= 0) || (_itemCount <= 0)) { effected.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE); - _log.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); + LOGGER.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java index f9a102f869..edcd13b407 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -97,7 +97,7 @@ public final class Summon extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 0fab6deaee..c73eb71458 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -38,7 +38,7 @@ public final class SummonAgathion extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); } _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7ad2935324..d745528a40 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -64,7 +64,7 @@ public final class SummonCubic extends AbstractEffect if (_cubicId < 0) { - _log.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index b10d5cb341..d88f72ee89 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -66,7 +66,7 @@ public class SummonHallucination extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -79,7 +79,7 @@ public class SummonHallucination extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 03d7f27857..15c94c90a2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -87,7 +87,7 @@ public final class SummonMulti extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index ae4549f39f..5779663ae6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -80,7 +80,7 @@ public final class SummonNpc extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -93,7 +93,7 @@ public final class SummonNpc extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } @@ -162,7 +162,7 @@ public final class SummonNpc extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); + LOGGER.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5d8b92393c..a771a8e4cc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -75,14 +75,14 @@ public final class SummonPet extends AbstractEffect final PetItemHolder holder = player.removeScript(PetItemHolder.class); if (holder == null) { - _log.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); + LOGGER.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); return; } final L2ItemInstance collar = holder.getItem(); if (player.getInventory().getItemByObjectId(collar.getObjectId()) != collar) { - _log.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); + LOGGER.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 4528a3f91b..984c53a5ab 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -57,7 +57,7 @@ public final class SummonTrap extends AbstractEffect if (_npcId <= 0) { - _log.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); return; } @@ -76,7 +76,7 @@ public final class SummonTrap extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index c3a9b08bde..8d18d6fecc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -110,7 +110,7 @@ public final class Synergy extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 32ac16aa59..da879def26 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -146,7 +146,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index c9ce6cc000..b7d80e1e34 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -64,7 +64,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -81,7 +81,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 351e687f0f..2ce0c6758c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -88,7 +88,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c950983e3d..1c010ed094 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -91,7 +91,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 7a474f5b8d..956ef40eed 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -102,7 +102,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index fefd166e0d..014142ca85 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -114,7 +114,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 23a72039a7..1f0c32d50d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -97,7 +97,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -124,7 +124,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ca7c1239ec..c34321b251 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -90,7 +90,7 @@ public class BeastSoulShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index d631936c0d..8a39d5177d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -92,7 +92,7 @@ public class BeastSpiritShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index a053b95a9d..e3b723050d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -52,7 +52,7 @@ public class BlessedSoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9800a7e664..52f772757a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -48,7 +48,7 @@ public class BlessedSpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index e7c5629cc7..e1df0bdc7a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -59,7 +59,7 @@ public class EventItem implements IItemHandler } default: { - _log.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); + LOGGER.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); } } return used; @@ -103,7 +103,7 @@ public class EventItem implements IItemHandler }); return true; } - _log.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); + LOGGER.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); return false; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 16a703c486..66eb8ce01c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -54,7 +54,7 @@ public class ExtractableItems implements IItemHandler final List exitems = etcitem.getExtractableItems(); if (exitems == null) { - _log.info("No extractable data defined for " + etcitem); + LOGGER.info("No extractable data defined for " + etcitem); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 5c5598ea69..ac21e53795 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -84,7 +84,7 @@ public class FishShots implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 4773bde656..59fe8bc737 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -51,7 +51,7 @@ public final class Harvester implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 6685ef0b0d..3352b32a09 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -61,7 +61,7 @@ public class ItemSkillsTemplate implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.info("Item " + item + " does not have registered any skill for handler."); + LOGGER.info("Item " + item + " does not have registered any skill for handler."); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 05c1ac3f7d..d3ffb95e30 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -49,7 +49,7 @@ public class SoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index ddf0402d2b..87f06565c2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -48,7 +48,7 @@ public class SpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java index 7144892fa5..59ecba44bb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ClanWarsList implements IUserCommandHandler { - private static final Logger _log = Logger.getLogger(ClanWarsList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanWarsList.class.getName()); private static final int[] COMMAND_IDS = { 88, @@ -119,7 +119,7 @@ public class ClanWarsList implements IUserCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } return true; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java index 7dced5f20e..5e98fa04f5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - _log.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); return; } @@ -133,7 +133,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // When nobody can enter if (enterGroup == null) { - _log.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); + LOGGER.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); return; } @@ -214,7 +214,7 @@ public abstract class AbstractInstance extends AbstractNpcAI } else { - _log.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); + LOGGER.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 87fe82da43..1a091c8e32 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -430,7 +430,7 @@ public final class ChamberOfDelusion extends AbstractInstance } catch (Exception e) { - _log.log(Level.WARNING, "Error occured in room change task: ", e); + LOGGER.log(Level.WARNING, "Error occured in room change task: ", e); } }, nextInterval - 5000); world.setParameter("roomChangeTask", roomChangeTask); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 8d437b8318..38eb8cc483 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -655,7 +655,7 @@ public final class Kamaloka extends AbstractInstance } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } return null; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java index c96029eb3e..8fc543646f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java @@ -274,7 +274,7 @@ public final class Q10814_BefittingOfTheStatus extends Quest final String text = getHtm(player.getHtmlPrefix(), fileName); if (text == null) { - _log.info("Cannot find HTML file for " + Q10814_BefittingOfTheStatus.class.getSimpleName() + " Quest: " + fileName); + LOGGER.info("Cannot find HTML file for " + Q10814_BefittingOfTheStatus.class.getSimpleName() + " Quest: " + fileName); return null; } html.setHtml(text); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java index 56052373d8..971bed40ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java @@ -449,7 +449,7 @@ import quests.Q10843_AnomalyInTheEnchantedValley.Q10843_AnomalyInTheEnchantedVal */ public class QuestMasterHandler { - private static final Logger _log = Logger.getLogger(QuestMasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(QuestMasterHandler.class.getName()); private static final Class[] QUESTS = { @@ -889,7 +889,7 @@ public class QuestMasterHandler } catch (Exception e) { - _log.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); + LOGGER.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java index bcd888210f..623b41de9f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java @@ -74,7 +74,7 @@ public abstract class AirShipController extends AbstractNpcAI } } - public static final Logger _log = Logger.getLogger(AirShipController.class.getName()); + public static final Logger LOGGER = Logger.getLogger(AirShipController.class.getName()); protected int _dockZone = 0; protected int _shipSpawnX = 0; protected int _shipSpawnY = 0; @@ -334,7 +334,7 @@ public abstract class AirShipController extends AbstractNpcAI final L2ScriptZone zone = ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class); if (zone == null) { - _log.warning(getName() + ": Invalid zone " + _dockZone + ", controller disabled"); + LOGGER.warning(getName() + ": Invalid zone " + _dockZone + ", controller disabled"); _isBusy = true; return; } @@ -344,7 +344,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (_arrivalPath.length == 0) { - _log.warning(getName() + ": Zero arrival path length."); + LOGGER.warning(getName() + ": Zero arrival path length."); _arrivalPath = null; } else @@ -352,7 +352,7 @@ public abstract class AirShipController extends AbstractNpcAI p = _arrivalPath[_arrivalPath.length - 1]; if (!zone.isInsideZone(p.getLocation())) { - _log.warning(getName() + ": Arrival path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") not in zone " + _dockZone); + LOGGER.warning(getName() + ": Arrival path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") not in zone " + _dockZone); _arrivalPath = null; } } @@ -361,7 +361,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (!ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class).isInsideZone(_shipSpawnX, _shipSpawnY, _shipSpawnZ)) { - _log.warning(getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled"); + LOGGER.warning(getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled"); _isBusy = true; return; } @@ -371,7 +371,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (_departPath.length == 0) { - _log.warning(getName() + ": Zero depart path length."); + LOGGER.warning(getName() + ": Zero depart path length."); _departPath = null; } else @@ -379,7 +379,7 @@ public abstract class AirShipController extends AbstractNpcAI p = _departPath[_departPath.length - 1]; if (zone.isInsideZone(p.getLocation())) { - _log.warning(getName() + ": Departure path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") in zone " + _dockZone); + LOGGER.warning(getName() + ": Departure path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") in zone " + _dockZone); _departPath = null; } } @@ -389,11 +389,11 @@ public abstract class AirShipController extends AbstractNpcAI { if (_fuelTable == null) { - _log.warning(getName() + ": Fuel consumption not defined."); + LOGGER.warning(getName() + ": Fuel consumption not defined."); } else if (_teleportsTable.length != _fuelTable.length) { - _log.warning(getName() + ": Fuel consumption not match teleport list."); + LOGGER.warning(getName() + ": Fuel consumption not match teleport list."); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatGludinRune.java index c162606bf1..7edfc605df 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatGludinRune implements Runnable { - private static final Logger _log = Logger.getLogger(BoatGludinRune.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatGludinRune.class.getName()); // Time: 1151s private static final VehiclePathPoint[] GLUDIN_TO_RUNE = @@ -343,7 +343,7 @@ public class BoatGludinRune implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index 1805617eaf..fea42bcaa9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatInnadrilTour implements Runnable { - private static final Logger _log = Logger.getLogger(BoatInnadrilTour.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatInnadrilTour.class.getName()); // Time: 1867s private static final VehiclePathPoint[] TOUR = @@ -186,7 +186,7 @@ public class BoatInnadrilTour implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index c04177df76..1e62f23d02 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatRunePrimeval implements Runnable { - private static final Logger _log = Logger.getLogger(BoatRunePrimeval.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatRunePrimeval.class.getName()); // Time: 239s private static final VehiclePathPoint[] RUNE_TO_PRIMEVAL = @@ -168,7 +168,7 @@ public class BoatRunePrimeval implements Runnable } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseRecievePacket.java index b8e2b08f14..33146d6d53 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseRecievePacket.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public abstract class BaseRecievePacket { - private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseRecievePacket.class.getName()); private final byte[] _decrypt; private int _off; @@ -78,7 +78,7 @@ public abstract class BaseRecievePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } return result; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseSendablePacket.java index 894ea357b0..c29adc3bce 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseSendablePacket.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; */ public abstract class BaseSendablePacket { - private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseSendablePacket.class.getName()); private final ByteArrayOutputStream _bao; @@ -78,7 +78,7 @@ public abstract class BaseSendablePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } _bao.write(0); @@ -93,7 +93,7 @@ public abstract class BaseSendablePacket } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java index a2f78c7c94..a11ea8c3b5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; public class ScrambledKeyPair { - private static Logger _log = Logger.getLogger(ScrambledKeyPair.class.getName()); + private static Logger LOGGER = Logger.getLogger(ScrambledKeyPair.class.getName()); public KeyPair _pair; public byte[] _scrambledModulus; @@ -66,7 +66,7 @@ public class ScrambledKeyPair { scrambledMod[0x40 + i] = (byte) (scrambledMod[0x40 + i] ^ scrambledMod[i]); } - _log.finer("Modulus was scrambled"); + LOGGER.finer("Modulus was scrambled"); return scrambledMod; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java index a4df772cc3..57a47cf456 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class ForumsBBSManager extends BaseBBSManager { - private static Logger _log = Logger.getLogger(ForumsBBSManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(ForumsBBSManager.class.getName()); private final List _table; private int _lastid = 1; @@ -51,7 +51,7 @@ public class ForumsBBSManager extends BaseBBSManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); } } @@ -61,7 +61,7 @@ public class ForumsBBSManager extends BaseBBSManager public void initRoot() { _table.forEach(f -> f.vload()); - _log.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java index 609f0858d5..4aa8b72edb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class CharNameTable { - private static Logger _log = Logger.getLogger(CharNameTable.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharNameTable.class.getName()); private final Map _chars = new ConcurrentHashMap<>(); private final Map _accessLevels = new ConcurrentHashMap<>(); @@ -114,7 +114,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); } if (id > 0) @@ -162,7 +162,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return null; // not found @@ -190,7 +190,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); } return result; } @@ -211,7 +211,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); } return 0; } @@ -232,7 +232,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -253,7 +253,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); } return 0; } @@ -274,7 +274,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -294,9 +294,9 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); } public static CharNameTable getInstance() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/DocumentBase.java index ed572cb74e..27ab4afc49 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/DocumentBase.java @@ -147,7 +147,7 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public abstract class DocumentBase { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final File _file; protected final Map _tables = new HashMap<>(); @@ -170,7 +170,7 @@ public abstract class DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Error loading file " + _file, e); + LOGGER.log(Level.SEVERE, "Error loading file " + _file, e); } return doc; } @@ -343,7 +343,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -360,7 +360,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -374,7 +374,7 @@ public abstract class DocumentBase return new ConditionLogicNot(parseCondition(n, template)); } } - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); return null; } @@ -893,7 +893,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1088,7 +1088,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1128,7 +1128,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); + LOGGER.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); } } cond = joinAnd(cond, new ConditionUsingItemType(mask)); @@ -1149,7 +1149,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); + LOGGER.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); } } cond = joinAnd(cond, new ConditionUsingSlotType(mask)); @@ -1185,7 +1185,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1215,7 +1215,7 @@ public abstract class DocumentBase } if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java index 4d3be938c9..c425e3360c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.LinkedList; import java.util.List; import java.util.logging.Level; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -43,6 +44,8 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public final class DocumentItem extends DocumentBase implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(DocumentItem.class.getName()); + private Item _currentItem = null; private final List _itemsInFile = new LinkedList<>(); @@ -92,7 +95,7 @@ public final class DocumentItem extends DocumentBase implements IGameXmlReader } catch (Exception e) { - _log.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); + LOGGER.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 6832094027..5343f17e51 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.util.MathUtil; */ public class GeoEngine { - protected static final Logger _log = Logger.getLogger(GeoEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GeoEngine.class.getName()); private final ABlock[][] _blocks; private final BlockNull _nullBlock; @@ -71,7 +71,7 @@ public class GeoEngine */ public GeoEngine() { - _log.info("GeoEngine: Initializing..."); + LOGGER.info("GeoEngine: Initializing..."); // initialize block container _blocks = new ABlock[GeoStructure.GEO_BLOCKS_X][GeoStructure.GEO_BLOCKS_Y]; @@ -105,7 +105,7 @@ public class GeoEngine } } - _log.info("GeoEngine: Loaded " + loaded + " geodata files."); + LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files."); // avoid wrong configs when no files are loaded if (loaded == 0) @@ -113,12 +113,12 @@ public class GeoEngine if (Config.PATHFINDING) { Config.PATHFINDING = false; - _log.info("GeoEngine: Forcing PathFinding setting to false."); + LOGGER.info("GeoEngine: Forcing PathFinding setting to false."); } if (Config.COORD_SYNCHRONIZE == 2) { Config.COORD_SYNCHRONIZE = -1; - _log.info("GeoEngine: Forcing CoordSynchronize setting to -1."); + LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); } } @@ -185,7 +185,7 @@ public class GeoEngine // check data consistency if (buffer.remaining() > 0) { - _log.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); + LOGGER.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); } // loading was successful @@ -194,8 +194,8 @@ public class GeoEngine catch (Exception e) { // an error occured while loading, load null blocks - _log.warning("GeoEngine: Error while loading " + filename + " region file."); - _log.warning(e.getMessage()); + LOGGER.warning("GeoEngine: Error while loading " + filename + " region file."); + LOGGER.warning(e.getMessage()); e.printStackTrace(); // replace whole region file with null blocks @@ -300,7 +300,7 @@ public class GeoEngine if (block == null) // null block check { // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) - // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // LOGGER.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java index ece8351c5e..b33b0292ac 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java @@ -57,11 +57,11 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); + LOGGER.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); } } - _log.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); + LOGGER.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); } @Override @@ -109,7 +109,7 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); return null; } finally diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IActionHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IActionHandler.java index c4addd7df5..3640b57f65 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IActionHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IActionHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionHandler { - Logger _log = Logger.getLogger(IActionHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java index 35c546715c..5c5b946828 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionShiftHandler { - Logger _log = Logger.getLogger(IActionShiftHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionShiftHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IBypassHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IBypassHandler.java index a5a6295386..626cdb2b17 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IBypassHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IBypassHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public interface IBypassHandler { - Logger _log = Logger.getLogger(IBypassHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IBypassHandler.class.getName()); /** * This is the worker method that is called when someone uses an bypass command. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IItemHandler.java index 2f3d043ad0..a2079cc4ec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IItemHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public interface IItemHandler { - Logger _log = Logger.getLogger(IItemHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IItemHandler.class.getName()); /** * Launch task associated to the item. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java index 4030ad83de..0f9c7b0132 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentType; */ public interface IPunishmentHandler { - Logger _log = Logger.getLogger(IPunishmentHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IPunishmentHandler.class.getName()); void onStart(PunishmentTask task); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java index 72b8a7b21a..d1cb086c89 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IUserCommandHandler { - Logger _log = Logger.getLogger(IUserCommandHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IUserCommandHandler.class.getName()); /** * this is the worker method that is called when someone uses an admin command. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java index e16e1eb679..9712fd7b04 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -60,7 +60,7 @@ import com.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi */ public final class CommissionManager { - private static final Logger _log = Logger.getLogger(CommissionManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CommissionManager.class.getName()); private static final int INTERACTION_DISTANCE = 250; private static final int ITEMS_LIMIT_PER_REQUEST = 999; @@ -103,7 +103,7 @@ public final class CommissionManager final L2ItemInstance itemInstance = itemInstances.get(rs.getInt("item_object_id")); if (itemInstance == null) { - _log.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); + LOGGER.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); continue; } final CommissionItem commissionItem = new CommissionItem(commissionId, itemInstance, rs.getLong("price_per_unit"), rs.getTimestamp("start_time").toInstant(), rs.getByte("duration_in_days")); @@ -121,7 +121,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); } } @@ -270,7 +270,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); player.sendPacket(SystemMessageId.THE_ITEM_HAS_FAILED_TO_BE_REGISTERED); player.sendPacket(ExResponseCommissionRegister.FAILED); } @@ -409,7 +409,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); } return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java index 7f4c6abd61..f635c19883 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class FactionManager { - private static Logger _log = Logger.getLogger(FactionManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(FactionManager.class.getName()); private final Map _playerFactions = new ConcurrentHashMap<>(); protected FactionManager() @@ -57,9 +57,9 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); } public final int getFactionByCharId(int id) @@ -91,7 +91,7 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return 0; // not found diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index b0fdfdf390..dc63278e16 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.entity.Fort; public final class FortManager implements InstanceListManager { - protected static final Logger _log = Logger.getLogger(FortManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); private final Map _forts = new ConcurrentSkipListMap<>(); @@ -131,7 +131,7 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - _log.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); for (Fort fort : getForts()) { fort.getSiege().loadSiegeGuard(); @@ -139,7 +139,7 @@ public final class FortManager implements InstanceListManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index aa7e2d3153..0a5245dafc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class FortSiegeManager { - private static final Logger _log = Logger.getLogger(FortSiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FortSiegeManager.class.getName()); private int _attackerMaxClans = 500; // Max number of clans @@ -101,7 +101,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -122,7 +122,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); + LOGGER.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); } // Siege setting @@ -163,7 +163,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading commander(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading commander(s) for " + fort.getName() + " fort."); } } @@ -189,7 +189,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading flag(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading flag(s) for " + fort.getName() + " fort."); } } _flagList.put(fort.getResidenceId(), _flagSpawns); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index 14f412ec48..338620a64f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; public final class GraciaSeedsManager { - private static final Logger _log = Logger.getLogger(GraciaSeedsManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GraciaSeedsManager.class.getName()); public static String ENERGY_SEEDS = "EnergySeeds"; @@ -70,7 +70,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); + LOGGER.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); break; } } @@ -124,7 +124,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); + LOGGER.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); } } } @@ -134,7 +134,7 @@ public final class GraciaSeedsManager final Quest quest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (quest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -155,7 +155,7 @@ public final class GraciaSeedsManager final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (esQuest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -171,7 +171,7 @@ public final class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { - _log.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); + LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 99c7fa7996..7102530261 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -47,7 +47,7 @@ public final class GrandBossManager implements IStorable private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?"; private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?"; - protected static Logger _log = Logger.getLogger(GrandBossManager.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GrandBossManager.class.getName()); protected static Map _bosses = new ConcurrentHashMap<>(); @@ -83,26 +83,26 @@ public final class GrandBossManager implements IStorable final int status = rs.getInt("status"); _bossStatus.put(bossId, status); _storedInfo.put(bossId, info); - _log.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); + LOGGER.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); if (status > 0) { - _log.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); + LOGGER.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); } } else { - _log.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); + LOGGER.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); } } - _log.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); } ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000); } @@ -119,7 +119,7 @@ public final class GrandBossManager implements IStorable public void setBossStatus(int bossId, int status) { _bossStatus.put(bossId, status); - _log.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); + LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); updateDb(bossId, true); } @@ -198,7 +198,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); return false; } return true; @@ -246,7 +246,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index e8b430a5df..c7290b6912 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public final class ItemsOnGroundManager implements Runnable { - private static final Logger _log = Logger.getLogger(ItemsOnGroundManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemsOnGroundManager.class.getName()); private final Set _items = ConcurrentHashMap.newKeySet(); @@ -88,7 +88,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); } } @@ -137,11 +137,11 @@ public final class ItemsOnGroundManager implements Runnable } } } - _log.info(getClass().getSimpleName() + ": Loaded " + count + " items."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + count + " items."); } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); } if (Config.EMPTY_DROPPED_ITEM_TABLE_AFTER_LOAD) @@ -185,7 +185,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e1) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); } } @@ -235,13 +235,13 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); } } } catch (SQLException e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java index ba4fdd6b6c..f47cf3f813 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.variables.PlayerVariables; */ public class MentorManager { - private static final Logger _log = Logger.getLogger(MentorManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MentorManager.class.getName()); private final Map> _menteeData = new ConcurrentHashMap<>(); private final Map _mentors = new ConcurrentHashMap<>(); @@ -65,7 +65,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -85,7 +85,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -104,7 +104,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } finally { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index f0f9d590c3..07ca9d909e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class PetitionManager { - protected static final Logger _log = Logger.getLogger(PetitionManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PetitionManager.class.getName()); private final Map _pendingPetitions; private final Map _completedPetitions; @@ -55,7 +55,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getCompletedPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() @@ -63,7 +63,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getPendingPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } public boolean acceptPetition(L2PcInstance respondingAdmin, int petitionId) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java index c1df0ca78b..6208afb86b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.Shutdown; */ public class ServerRestartManager { - static final Logger _log = Logger.getLogger(ServerRestartManager.class.getName()); + static final Logger LOGGER = Logger.getLogger(ServerRestartManager.class.getName()); private String nextRestartTime = "unknown"; @@ -72,12 +72,12 @@ public class ServerRestartManager { nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime()); ThreadPool.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000)); - _log.info("Scheduled server restart at " + lastRestart.getTime() + "."); + LOGGER.info("Scheduled server restart at " + lastRestart.getTime() + "."); } } catch (Exception e) { - _log.info("The scheduled server restart config is not set properly, please correct it!"); + LOGGER.info("The scheduled server restart config is not set properly, please correct it!"); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java index 728cb6ca44..38d9a81244 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; public final class SiegeManager { - private static final Logger _log = Logger.getLogger(SiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SiegeManager.class.getName()); private final Map> _controlTowers = new HashMap<>(); private final Map> _flameTowers = new HashMap<>(); @@ -103,7 +103,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -152,7 +152,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); } } @@ -183,7 +183,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); } } _controlTowers.put(castle.getResidenceId(), controlTowers); @@ -289,7 +289,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java index 5e16e5a91f..876a3a1ec9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class MessageDeletionTask implements Runnable { - private static final Logger _log = Logger.getLogger(MessageDeletionTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MessageDeletionTask.class.getName()); final int _msgId; @@ -76,7 +76,7 @@ public final class MessageDeletionTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); } } MailManager.getInstance().deleteMessageInDb(msg.getId()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/BlockList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/BlockList.java index 627b0dbbe4..3ec7e52fe7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/BlockList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/BlockList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BlockList { - private static Logger _log = Logger.getLogger(BlockList.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlockList.class.getName()); private static final Map> OFFLINE_LIST = new ConcurrentHashMap<>(); private final L2PcInstance _owner; @@ -91,7 +91,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); } return list; } @@ -122,7 +122,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java index 7be7f3cb10..f44f27266b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate; */ public final class CharEffectList { - private static final Logger _log = Logger.getLogger(CharEffectList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); /** Queue containing all effects from buffs for this effect list. */ private volatile Queue _actives; /** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */ @@ -897,7 +897,7 @@ public final class CharEffectList // Passive effects don't need stack type! if (!skill.getAbnormalType().isNone()) { - _log.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); + LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); } // Check for passive skill conditions. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CursedWeapon.java index d579628d09..a9be2c6a4a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class CursedWeapon implements INamable { - private static final Logger _log = Logger.getLogger(CursedWeapon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CursedWeapon.class.getName()); // _name is the name of the cursed weapon associated with its ID. private final String _name; @@ -95,7 +95,7 @@ public class CursedWeapon implements INamable if ((_player != null) && _player.isOnline()) { // Remove from player - _log.info(_name + " being removed online."); + LOGGER.info(_name + " being removed online."); _player.abortAttack(); @@ -134,7 +134,7 @@ public class CursedWeapon implements INamable else { // Remove from Db - _log.info(_name + " being removed offline."); + LOGGER.info(_name + " being removed offline."); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?"); @@ -145,7 +145,7 @@ public class CursedWeapon implements INamable del.setInt(2, _itemId); if (del.executeUpdate() != 1) { - _log.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); + LOGGER.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); } // Restore the reputation @@ -154,12 +154,12 @@ public class CursedWeapon implements INamable ps.setInt(3, _playerId); if (ps.executeUpdate() != 1) { - _log.warning("Error while updating karma & pkkills for userId " + _playerId); + LOGGER.warning("Error while updating karma & pkkills for userId " + _playerId); } } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); } } } @@ -196,7 +196,7 @@ public class CursedWeapon implements INamable else if (_item != null) { _item.decayMe(); - _log.info(_name + " item has been removed from World."); + LOGGER.info(_name + " item has been removed from World."); } } @@ -492,7 +492,7 @@ public class CursedWeapon implements INamable } catch (SQLException e) { - _log.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); + LOGGER.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java index e1bbddd336..96583b545c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -81,7 +81,7 @@ import com.l2jmobius.gameserver.util.Util; public class L2Clan implements IIdentifiable, INamable { - private static final Logger _log = Logger.getLogger(L2Clan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Clan.class.getName()); // SQL queries private static final String INSERT_CLAN_DATA = "INSERT INTO clan_data (clan_id,clan_name,clan_level,hasCastle,blood_alliance_count,blood_oath_count,ally_id,ally_name,leader_id,crest_id,crest_large_id,ally_crest_id,new_leader_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -273,7 +273,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); } } @@ -313,14 +313,14 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); } } broadcastClanStatus(); broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1).addString(member.getName())); - _log.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); + LOGGER.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); } /** @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - _log.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + getName() + " without clan leader!"); return ""; } return _leader.getName(); @@ -433,7 +433,7 @@ public class L2Clan implements IIdentifiable, INamable final L2ClanMember exMember = _members.remove(objectId); if (exMember == null) { - _log.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); + LOGGER.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); return; } final int leadssubpledge = getLeaderSubPledge(objectId); @@ -888,7 +888,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -932,7 +932,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -948,7 +948,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); } // Update variables at database @@ -991,7 +991,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); } } @@ -1032,7 +1032,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); } } @@ -1062,7 +1062,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); } } @@ -1137,7 +1137,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); } } @@ -1158,7 +1158,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); } } @@ -1200,7 +1200,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); } _notice = notice; @@ -1267,7 +1267,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); + LOGGER.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); } } } @@ -1275,7 +1275,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); } } @@ -1351,7 +1351,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.warning("Subpledge " + subType + " does not exist for clan " + this); + LOGGER.warning("Subpledge " + subType + " does not exist for clan " + this); return oldSkill; } } @@ -1383,7 +1383,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); @@ -1435,7 +1435,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } @@ -1781,7 +1781,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); } } @@ -1890,7 +1890,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); } broadcastToOnlineMembers(new PledgeShowInfoUpdate(_leader.getClan())); @@ -1955,7 +1955,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); } } @@ -1987,7 +1987,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); } } @@ -2023,7 +2023,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } for (L2ClanMember cm : getMembers()) @@ -2058,7 +2058,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); } } } @@ -2174,7 +2174,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); } } } @@ -2717,7 +2717,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); } setLevel(level); @@ -2763,7 +2763,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2800,7 +2800,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); } if (onlyThisClan) @@ -2846,7 +2846,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Mentee.java index 6122c5f6ac..a1eb3d2480 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class L2Mentee { - private static final Logger _log = Logger.getLogger(L2Mentee.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Mentee.class.getName()); private final int _objectId; private String _name; @@ -65,7 +65,7 @@ public class L2Mentee } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } else diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java index 5f14864046..38044ee767 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2Party extends AbstractPlayerGroup { - private static final Logger _log = Logger.getLogger(L2Party.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Party.class.getName()); // @formatter:off private static final double[] BONUS_EXP_SP = @@ -536,7 +536,7 @@ public class L2Party extends AbstractPlayerGroup } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } SystemMessage msg; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Territory.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Territory.java index 41cb26df2b..2ee5d868d2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Territory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Territory.java @@ -28,7 +28,7 @@ import com.l2jmobius.commons.util.Rnd; */ public class L2Territory { - private static Logger _log = Logger.getLogger(L2Territory.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2Territory.class.getName()); protected static class Point { @@ -176,7 +176,7 @@ public class L2Territory return new Location(x, y, Rnd.get(zmin, _zMax)); } } - _log.warning("Can't make point for territory " + _terr); + LOGGER.warning("Can't make point for territory " + _terr); return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MacroList.java index 737e876e1e..577b101249 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MacroList.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SendMacroList; public class MacroList implements IRestorable { - private static final Logger _log = Logger.getLogger(MacroList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MacroList.class.getName()); private final L2PcInstance _owner; private int _macroId; @@ -154,7 +154,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store macro:", e); + LOGGER.log(Level.WARNING, "could not store macro:", e); } } @@ -169,7 +169,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete macro:", e); + LOGGER.log(Level.WARNING, "could not delete macro:", e); } } @@ -215,7 +215,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store shortcuts:", e); + LOGGER.log(Level.WARNING, "could not store shortcuts:", e); return false; } return true; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ShortCuts.java index 3f8d959ef6..81e2c6f902 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ShortCuts.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; public class ShortCuts implements IRestorable { - private static Logger _log = Logger.getLogger(ShortCuts.class.getName()); + private static Logger LOGGER = Logger.getLogger(ShortCuts.class.getName()); private static final int MAX_SHORTCUTS_PER_BAR = 12; private final L2PcInstance _owner; private final Map _shortCuts = new TreeMap<>(); @@ -100,7 +100,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); } } @@ -165,7 +165,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); } } @@ -195,7 +195,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/TradeList.java index 7a25f5afe4..e3a47338d3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/TradeList.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class TradeList { - private static final Logger _log = Logger.getLogger(TradeList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TradeList.class.getName()); private final L2PcInstance _owner; private L2PcInstance _partner; @@ -204,45 +204,45 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Object o = L2World.getInstance().findObject(objectId); if (!(o instanceof L2ItemInstance)) { - _log.warning(_owner.getName() + ": Trying to add something other than an item!"); + LOGGER.warning(_owner.getName() + ": Trying to add something other than an item!"); return null; } final L2ItemInstance item = (L2ItemInstance) o; if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { - _log.warning(_owner.getName() + ": Attempt to add a restricted item!"); + LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) { - _log.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; } if ((count <= 0) || (count > item.getCount())) { - _log.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); return null; } if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -250,7 +250,7 @@ public class TradeList { if (checkitem.getObjectId() == objectId) { - _log.warning(_owner.getName() + ": Attempt to add an item that is already present!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that is already present!"); return null; } } @@ -274,14 +274,14 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); return null; } @@ -292,13 +292,13 @@ public class TradeList if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -321,13 +321,13 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } if (count < 0) { - _log.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); return null; } @@ -341,7 +341,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return null; } partnerList.invalidateConfirmation(); @@ -416,7 +416,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return false; } @@ -485,7 +485,7 @@ public class TradeList // Check for Owner validity if ((_owner == null) || (L2World.getInstance().getPlayer(_owner.getObjectId()) == null)) { - _log.warning("Invalid owner of TradeList"); + LOGGER.warning("Invalid owner of TradeList"); return false; } @@ -495,7 +495,7 @@ public class TradeList final L2ItemInstance item = _owner.checkItemManipulation(titem.getObjectId(), titem.getCount(), "transfer"); if ((item == null) || (item.getCount() < 1)) { - _log.warning(_owner.getName() + ": Invalid Item in TradeList"); + LOGGER.warning(_owner.getName() + ": Invalid Item in TradeList"); return false; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 75c6e98235..91d739cd2d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -632,7 +632,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } @@ -690,7 +690,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -803,7 +803,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = getAggroList().get(target); if (ai == null) { - _log.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 944e723989..1ebbe0e5f3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -176,7 +176,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class L2Character extends L2Object implements ISkillsHolder, IDeletable { - public static final Logger _log = Logger.getLogger(L2Character.class.getName()); + public static final Logger LOGGER = Logger.getLogger(L2Character.class.getName()); private volatile Set> _attackByList; @@ -3278,7 +3278,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Temporary fix for character outside world region errors (should not happen) if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) { - _log.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); + LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); if (isPlayer()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 8679593b56..884011206b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -624,7 +624,7 @@ public class L2Npc extends L2Character } else { - _log.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); } } } @@ -1189,7 +1189,7 @@ public class L2Npc extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } if (isChannelized()) @@ -1560,7 +1560,7 @@ public class L2Npc extends L2Character if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); + LOGGER.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java index 94fe6bb6b5..3dd9a9d68e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java @@ -395,7 +395,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed stopMove().", e); + LOGGER.log(Level.SEVERE, "Failed stopMove().", e); } try @@ -404,7 +404,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed oustPlayers().", e); + LOGGER.log(Level.SEVERE, "Failed oustPlayers().", e); } final ZoneRegion oldZoneRegion = ZoneManager.getInstance().getRegion(this); @@ -415,7 +415,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } oldZoneRegion.removeFromZones(this); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java index 8e72579b54..05339545d3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java @@ -61,7 +61,7 @@ public class L2ControlTowerInstance extends L2Tower } catch (Exception e) { - _log.log(Level.WARNING, "Error at L2ControlTowerInstance", e); + LOGGER.log(Level.WARNING, "Error at L2ControlTowerInstance", e); } } _guards.clear(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 6c554e10e0..91548e2a10 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -100,7 +100,7 @@ public class L2DecoyInstance extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } @@ -126,7 +126,7 @@ public class L2DecoyInstance extends L2Character } catch (Throwable e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index f9aa07f44d..97c2348dec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -123,7 +123,7 @@ public class L2DefenderInstance extends L2Attackable if ((_fort == null) && (_castle == null)) { - _log.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); + LOGGER.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 4fb7bbb976..baab09b858 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -219,7 +219,7 @@ public final class L2DoorInstance extends L2Character } else { - _log.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); + LOGGER.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 71096be532..1519fc6308 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -74,14 +74,14 @@ public class L2MerchantInstance extends L2NpcInstance final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } if (!buyList.isNpcAllowed(getId())) { - _log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); + LOGGER.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 84a6a6f8cc..9eea2cf36a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -1346,7 +1346,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Attempted to remove unknown RecipeList: " + recipeId); + LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } for (Shortcut sc : getAllShortCuts()) @@ -1371,7 +1371,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -1387,7 +1387,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -2631,7 +2631,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Skipping null auto-get skill for player: " + toString()); + LOGGER.warning("Skipping null auto-get skill for player: " + toString()); } } } @@ -3271,7 +3271,7 @@ public final class L2PcInstance extends L2Playable final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); + LOGGER.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); return null; } // Sends message to client if requested @@ -3314,7 +3314,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof L2EtcItem ? (L2EtcItem) item : null); if (handler == null) { - _log.warning("No item handler registered for Herb ID " + item.getId() + "!"); + LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!"); } else { @@ -3832,7 +3832,7 @@ public final class L2PcInstance extends L2Playable // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { - _log.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); return null; } @@ -3840,19 +3840,19 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return null; } if ((count < 0) || ((count > 1) && !item.isStackable())) { - _log.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); return null; } if (count > item.getCount()) { - _log.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); return null; } @@ -3881,7 +3881,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_protectEndTime > 0))) { - _log.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _protectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -3891,7 +3891,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_teleportProtectEndTime > 0))) { - _log.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _teleportProtectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -4412,7 +4412,7 @@ public final class L2PcInstance extends L2Playable if (!object.isItem()) { // dont try to pickup anything that is not an item :) - _log.warning(this + " trying to pickup wrong target." + getTarget()); + LOGGER.warning(this + " trying to pickup wrong target." + getTarget()); return; } @@ -4512,7 +4512,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -5174,11 +5174,11 @@ public final class L2PcInstance extends L2Playable if (isKarmaDrop) { - _log.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } else { - _log.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } if (++dropCount >= dropLimit) @@ -6272,7 +6272,7 @@ public final class L2PcInstance extends L2Playable L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level); if (accessLevel == null) { - _log.warning("Can't find access level " + level + " for character " + toString()); + LOGGER.warning("Can't find access level " + level + " for character " + toString()); accessLevel = AdminData.getInstance().getAccessLevel(0); } @@ -6281,7 +6281,7 @@ public final class L2PcInstance extends L2Playable accessLevel = AdminData.getInstance().getAccessLevel(Config.DEFAULT_ACCESS_LEVEL); if (accessLevel == null) { - _log.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); + LOGGER.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); accessLevel = AdminData.getInstance().getAccessLevel(0); Config.DEFAULT_ACCESS_LEVEL = 0; } @@ -6307,7 +6307,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); + LOGGER.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); } } @@ -6315,11 +6315,11 @@ public final class L2PcInstance extends L2Playable if (accessLevel == null) { - _log.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); + LOGGER.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); } else if (level > 0) { - _log.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); + LOGGER.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); } } @@ -6428,7 +6428,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed updating character online status.", e); + LOGGER.log(Level.SEVERE, "Failed updating character online status.", e); } } @@ -6481,7 +6481,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); return false; } return true; @@ -6630,7 +6630,7 @@ public final class L2PcInstance extends L2Playable catch (Exception e) { player.setBaseClass(activeClassId); - _log.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); + LOGGER.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); } // Restore Subclass Data (cannot be done earlier in function) @@ -6653,7 +6653,7 @@ public final class L2PcInstance extends L2Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - _log.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -6794,7 +6794,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed loading character.", e); + LOGGER.log(Level.SEVERE, "Failed loading character.", e); } return player; } @@ -6884,7 +6884,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); } return true; } @@ -6992,7 +6992,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); } } @@ -7022,7 +7022,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); } } @@ -7038,7 +7038,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); } } @@ -7053,7 +7053,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.severe("Could not delete premium item: " + e); + LOGGER.severe("Could not delete premium item: " + e); } } @@ -7171,7 +7171,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); } } @@ -7201,7 +7201,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); } } @@ -7325,7 +7325,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store char effect data: ", e); } } @@ -7357,7 +7357,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char item reuse data: ", e); + LOGGER.log(Level.WARNING, "Could not store char item reuse data: ", e); } } @@ -7446,7 +7446,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); } } @@ -7506,12 +7506,12 @@ public final class L2PcInstance extends L2Playable } // else // { - // _log.warning("Could not store new skill, it's null!"); + // LOGGER.warning("Could not store new skill, it's null!"); // } } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7546,7 +7546,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7574,7 +7574,7 @@ public final class L2PcInstance extends L2Playable if (skill == null) { - _log.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); + LOGGER.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); continue; } @@ -7597,7 +7597,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); } } @@ -7655,7 +7655,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } } @@ -7721,7 +7721,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); } } @@ -7785,7 +7785,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); } // Calculate henna modifiers of this player. @@ -7853,7 +7853,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed removing character henna.", e); + LOGGER.log(Level.SEVERE, "Failed removing character henna.", e); } // Calculate Henna modifiers of this L2PcInstance @@ -7952,7 +7952,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed saving character henna.", e); + LOGGER.log(Level.SEVERE, "Failed saving character henna.", e); } // Task for henna duration @@ -8107,7 +8107,7 @@ public final class L2PcInstance extends L2Playable if (isLocked()) { - _log.warning("Player " + getName() + " tried to restart/logout during class change."); + LOGGER.warning("Player " + getName() + " tried to restart/logout during class change."); return false; } @@ -8458,7 +8458,7 @@ public final class L2PcInstance extends L2Playable if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { - _log.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); + LOGGER.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -9589,7 +9589,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); return false; } @@ -9704,7 +9704,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -9792,7 +9792,7 @@ public final class L2PcInstance extends L2Playable final L2PcTemplate pcTemplate = PlayerTemplateData.getInstance().getTemplate(classId); if (pcTemplate == null) { - _log.severe("Missing template for classId: " + classId); + LOGGER.severe("Missing template for classId: " + classId); throw new Error(); } // Set the template of the L2PcInstance @@ -9875,7 +9875,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -10115,7 +10115,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10127,7 +10127,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogin(this), this); @@ -10612,7 +10612,7 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return false; } @@ -10754,7 +10754,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) @@ -10762,13 +10762,13 @@ public final class L2PcInstance extends L2Playable { if (!isOnline()) { - _log.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); + LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } setOnlineStatus(false, true); } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10780,7 +10780,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10792,7 +10792,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove combat flag @@ -10815,7 +10815,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10828,7 +10828,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10840,7 +10840,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Recommendations must be saved before task (timer) is canceled @@ -10850,7 +10850,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop the HP/MP/CP Regeneration task (scheduled tasks) try @@ -10859,7 +10859,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10868,7 +10868,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Cancel Attak or Cast @@ -10878,7 +10878,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isChannelized()) @@ -10899,7 +10899,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // If a Party is in progress, leave it (and festival party) @@ -10911,7 +10911,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10946,7 +10946,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // returns pet to control item } @@ -10964,7 +10964,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10984,7 +10984,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11004,7 +11004,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove player from instance @@ -11017,7 +11017,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11027,7 +11027,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its inventory and remove them from the world @@ -11037,7 +11037,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its warehouse and remove them from the world @@ -11047,7 +11047,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (Config.WAREHOUSE_CACHE) { @@ -11060,7 +11060,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11069,7 +11069,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isCursedWeaponEquipped()) @@ -11080,7 +11080,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11128,7 +11128,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); } // Stop all passives and augment options @@ -11454,7 +11454,7 @@ public final class L2PcInstance extends L2Playable { if (killer == null) { - _log.warning(this + " called calculateShilensBreathDebuffLevel with killer null!"); + LOGGER.warning(this + " called calculateShilensBreathDebuffLevel with killer null!"); return; } @@ -11915,7 +11915,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); + LOGGER.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); } } } @@ -12044,7 +12044,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); } } @@ -12064,7 +12064,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -12213,7 +12213,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); } @@ -12234,7 +12234,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); } } @@ -12453,7 +12453,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); } } @@ -12550,7 +12550,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); + LOGGER.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); } } } @@ -12573,7 +12573,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); } _manufactureItems = manufactureItems; @@ -12824,12 +12824,12 @@ public final class L2PcInstance extends L2Playable if (nextLevel == -1) { - _log.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from player " + toString()); removeSkill(skill, true); // there is no lower skill } else { - _log.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } @@ -12975,7 +12975,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); } } @@ -13019,7 +13019,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); } } @@ -13039,7 +13039,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); } } @@ -13800,14 +13800,14 @@ public final class L2PcInstance extends L2Playable { sendMessage("The command " + command.substring(6) + " does not exist!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, getAccessLevel())) { sendMessage("You don't have the access rights to use this command!"); - _log.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); + LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 5718895451..ca24302555 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -576,7 +576,7 @@ public class L2PetInstance extends L2Summon final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -771,7 +771,7 @@ public class L2PetInstance extends L2Summon if (removedItem == null) { - _log.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); + LOGGER.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); } else { @@ -1059,7 +1059,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not store pet effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store pet effect data: ", e); } } @@ -1098,7 +1098,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { @@ -1404,7 +1404,7 @@ public class L2PetInstance extends L2Summon } else { - _log.warning("Pet control item null, for pet: " + toString()); + LOGGER.warning("Pet control item null, for pet: " + toString()); } super.setName(name); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 2c113f3992..fcd45fb1b0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -376,7 +376,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store summon effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store summon effect data: ", e); } } @@ -442,7 +442,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index 23ca608434..2fcc796ffa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -55,7 +55,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2VillageMasterInstance extends L2NpcInstance { - private static Logger _log = Logger.getLogger(L2VillageMasterInstance.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2VillageMasterInstance.class.getName()); public L2VillageMasterInstance(L2NpcTemplate template) { @@ -627,7 +627,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } catch (PatternSyntaxException e) { - _log.warning("ERROR: Wrong pattern for clan name!"); + LOGGER.warning("ERROR: Wrong pattern for clan name!"); pattern = Pattern.compile(".*"); } return pattern.matcher(name).matches(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java index b448f021a8..d2cd097234 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java @@ -93,7 +93,7 @@ public class PetStat extends SummonStat { if (getActiveChar() != null) { - _log.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); + LOGGER.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); } throw e; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index aaecadf5c5..222d29419e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp public class PlayableStat extends CharStat { - protected static final Logger _log = Logger.getLogger(PlayableStat.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PlayableStat.class.getName()); public PlayableStat(L2Playable activeChar) { @@ -195,7 +195,7 @@ public class PlayableStat extends CharStat { if (value < 0) { - _log.warning("wrong usage"); + LOGGER.warning("wrong usage"); return false; } final long currentSp = getSp(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index 352a7719ae..0ce091c546 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.stats.Stats; public class CharStatus { - protected static final Logger _log = Logger.getLogger(CharStatus.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(CharStatus.class.getName()); private final L2Character _activeChar; @@ -449,7 +449,7 @@ public class CharStatus } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java index 3fa6773fd2..1b1003f76d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc; */ public class RandomAnimationTask implements Runnable { - private static final Logger _log = Logger.getLogger(RandomAnimationTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RandomAnimationTask.class.getName()); private final L2Npc _npc; private boolean _stopTask; @@ -70,7 +70,7 @@ public class RandomAnimationTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); + LOGGER.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java index 39eaa5b37a..755ae87ebc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction; */ public class TrapTask implements Runnable { - private static final Logger _log = Logger.getLogger(TrapTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TrapTask.class.getName()); private static final int TICK = 1000; // 1s private final L2TrapInstance _trap; @@ -65,7 +65,7 @@ public class TrapTask implements Runnable } catch (Exception e) { - _log.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); _trap.unSummon(); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java index 1801510a6b..a08fc73212 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.LeaveWorld; */ public class GameGuardCheckTask implements Runnable { - private static final Logger _log = Logger.getLogger(GameGuardCheckTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GameGuardCheckTask.class.getName()); private final L2PcInstance _player; @@ -47,7 +47,7 @@ public class GameGuardCheckTask implements Runnable if ((client != null) && !client.isAuthedGG() && _player.isOnline()) { AdminData.getInstance().broadcastMessageToGMs("Client " + client + " failed to reply GameGuard query and is being kicked!"); - _log.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); + LOGGER.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); client.close(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 23cfffc2bb..fc78d6a4db 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.Disconnection; */ public final class IllegalPlayerActionTask implements Runnable { - private static final Logger _log = Logger.getLogger("audit"); + private static final Logger LOGGER = Logger.getLogger("audit"); private final String _message; private final IllegalActionPunishmentType _punishment; @@ -74,7 +74,7 @@ public final class IllegalPlayerActionTask implements Runnable @Override public void run() { - _log.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); + LOGGER.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); AdminData.getInstance().broadcastMessageToGMs(_message); if (!_actor.isGM()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index 8b4bd27212..73c3219140 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PetFeedTask implements Runnable { - private static final Logger _log = Logger.getLogger(PetFeedTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PetFeedTask.class.getName()); private final L2PcInstance _player; @@ -99,7 +99,7 @@ public class PetFeedTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); + LOGGER.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/Announcement.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/Announcement.java index 3873f71d14..4e5aa84b0f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/Announcement.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/Announcement.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class Announcement implements IAnnouncement { - protected static final Logger _log = Logger.getLogger(Announcement.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Announcement.class.getName()); private static final String INSERT_QUERY = "INSERT INTO announcements (type, content, author) VALUES (?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE announcements SET type = ?, content = ?, author = ? WHERE id = ?"; @@ -125,7 +125,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -145,7 +145,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -162,7 +162,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java index f85c9affc0..a18af9fc50 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,7 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; - private static final Logger _log = Logger.getLogger(AnnouncementType.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) { @@ -40,7 +40,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); return NORMAL; } @@ -53,7 +53,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); return NORMAL; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index a47ba1a0a5..ebee3cd82c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -114,7 +114,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -137,7 +137,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/buylist/Product.java index 97571235ed..03b1a51b6b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; */ public final class Product { - private static final Logger _log = Logger.getLogger(Product.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Product.class.getName()); private final int _buyListId; private final L2Item _item; @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - _log.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 90ac2108aa..805960c36b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public abstract class AbstractEffect { - protected static final Logger _log = Logger.getLogger(AbstractEffect.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEffect.class.getName()); private int _ticks; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index 6892d0798a..ce7a68dcc7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -56,7 +56,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class BlockCheckerEngine { - protected static final Logger _log = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -309,7 +309,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); + LOGGER.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); } } @@ -417,7 +417,7 @@ public final class BlockCheckerEngine // Wrong arena passed, stop event if (_arena == -1) { - _log.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); + LOGGER.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); return; } _isStarted = true; @@ -508,7 +508,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Spawn the block carrying girl @@ -530,8 +530,8 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } @@ -558,7 +558,7 @@ public final class BlockCheckerEngine { if (_spawn == null) { - _log.warning("HBCE: Block Carrying Girl is null"); + LOGGER.warning("HBCE: Block Carrying Girl is null"); return; } SpawnTable.getInstance().deleteSpawn(_spawn, false); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java index a6faf0b0df..4fa38d85d4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public final class Castle extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Castle.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Castle.class.getName()); private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); @@ -212,7 +212,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -232,7 +232,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; } @@ -542,7 +542,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } oldOwner.setCastleId(0); // Unset has castle flag for old owner for (L2PcInstance member : oldOwner.getOnlineMembers(0)) @@ -683,7 +683,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); } } @@ -704,7 +704,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); } } @@ -724,7 +724,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -801,7 +801,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); } } @@ -821,7 +821,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -848,7 +848,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); } } } @@ -891,7 +891,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -1042,7 +1042,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); } } @@ -1086,7 +1086,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -1110,7 +1110,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); } } final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(getResidenceId()).get(towerIndex); @@ -1135,7 +1135,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -1184,7 +1184,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); return; } spawn.setX(holder.getX()); @@ -1219,7 +1219,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } _castleSide = side; Broadcast.toAllOnlinePlayers(new ExCastleState(this)); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Couple.java index c31232e232..c40e7d454a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Couple.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class Couple { - private static final Logger _log = Logger.getLogger(Couple.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Couple.class.getName()); private int _Id = 0; private int _player1Id = 0; @@ -67,7 +67,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); } } @@ -99,7 +99,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); } } @@ -117,7 +117,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); } } @@ -131,7 +131,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Duel.java index d601203f8d..826a7beece 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class Duel { - protected static final Logger _log = Logger.getLogger(Duel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Duel.class.getName()); public static final int DUELSTATE_NODUEL = 0; public static final int DUELSTATE_DUELLING = 1; @@ -223,7 +223,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); } } } @@ -266,7 +266,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); } } } @@ -291,7 +291,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); } } } @@ -994,7 +994,7 @@ public class Duel { if ((player != _playerA) && (player != _playerB)) { - _log.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); + LOGGER.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); } if (_playerA == player) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java index 75ec9236b8..aaece02dae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Fort extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Fort.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Fort.class.getName()); private final List _doors = new ArrayList<>(); private L2StaticObjectInstance _flagPole = null; @@ -227,7 +227,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Fort extends AbstractResidence { if (clan == null) { - _log.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); + LOGGER.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); return false; } @@ -396,7 +396,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } removeOwner(true); } @@ -496,7 +496,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); } } @@ -606,7 +606,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } @@ -627,7 +627,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); } } @@ -647,7 +647,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -744,7 +744,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -775,7 +775,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); } } @@ -844,7 +844,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -968,7 +968,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); } } } @@ -1008,7 +1008,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); } } @@ -1154,7 +1154,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1183,7 +1183,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1213,7 +1213,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1249,7 +1249,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 053af69e9d..80e02260d5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class FortSiege implements Siegable { - protected static final Logger _log = Logger.getLogger(FortSiege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortSiege.class.getName()); // SQL private static final String DELETE_FORT_SIEGECLANS_BY_CLAN_ID = "DELETE FROM fortsiege_clans WHERE fort_id = ? AND clan_id = ?"; @@ -82,7 +82,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -169,12 +169,12 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); + LOGGER.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); } } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); } } } @@ -195,7 +195,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -218,7 +218,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -293,7 +293,7 @@ public class FortSiege implements Siegable getFort().setVisibleFlag(true); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -343,7 +343,7 @@ public class FortSiege implements Siegable announceToPlayer(sm); saveFortSiege(); - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -533,7 +533,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -689,7 +689,7 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); } } } @@ -816,7 +816,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); } } @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new FortSiege.ScheduleStartSiegeTask(60), 0); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); } } } @@ -1013,7 +1013,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1066,7 +1066,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1092,7 +1092,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); } } @@ -1120,7 +1120,7 @@ public class FortSiege implements Siegable catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/L2Event.java index be28d47897..dbdbdae0e9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/L2Event.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/L2Event.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class L2Event { - protected static final Logger _log = Logger.getLogger(L2Event.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2Event.class.getName()); public static EventState eventState = EventState.OFF; public static String _eventName = ""; public static String _eventCreator = ""; @@ -151,7 +151,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); } } } @@ -187,7 +187,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); } } @@ -308,7 +308,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); } } @@ -399,7 +399,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event participation, an error has occured."; } @@ -475,7 +475,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event, an error has occured."; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Siege.java index c3b017869d..d18783ec7d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class Siege implements Siegable { - protected static final Logger _log = Logger.getLogger(Siege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Siege.class.getName()); // typeId's public static final byte OWNER = -1; @@ -142,7 +142,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -215,7 +215,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -781,7 +781,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -798,7 +798,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); } } @@ -983,7 +983,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); } } @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - _log.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); loadSiegeClan(); @@ -1275,7 +1275,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1360,7 +1360,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1428,7 +1428,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); } } @@ -1482,7 +1482,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); } _controlTowerCount = _controlTowers.size(); } @@ -1506,7 +1506,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 28ff51de81..de9e909fa9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -162,7 +162,7 @@ import com.l2jmobius.gameserver.util.MinionList; */ public abstract class AbstractScript extends ManagedScript implements IEventTimerEvent, IEventTimerCancel { - protected static final Logger _log = Logger.getLogger(AbstractScript.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractScript.class.getName()); private final Map> _registeredIds = new ConcurrentHashMap<>(); private final Queue _listeners = new PriorityBlockingQueue<>(); private volatile TimerExecutor _timerExecutor; @@ -186,7 +186,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime public void onTimerEvent(String event, StatsSet params, L2Npc npc, L2PcInstance player) { - _log.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); + LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } public void onTimerCancel(String event, StatsSet params, L2Npc npc, L2PcInstance player) @@ -230,17 +230,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final EventType eventType = listener.value(); if (method.getParameterCount() != 1) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); continue; } else if (!eventType.isEventClass(method.getParameterTypes()[0])) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); continue; } else if (!eventType.isReturnClass(method.getReturnType())) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); continue; } @@ -276,7 +276,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final Range range = (Range) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -292,7 +292,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -307,12 +307,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final NpcLevelRange range = (NpcLevelRange) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -330,12 +330,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -392,7 +392,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -410,7 +410,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -500,7 +500,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -518,7 +518,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -537,7 +537,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -554,7 +554,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -597,7 +597,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -614,7 +614,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -634,7 +634,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -652,7 +652,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -672,7 +672,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -690,7 +690,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -710,7 +710,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -728,7 +728,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -1019,7 +1019,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1037,7 +1037,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1724,7 +1724,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } @@ -1844,7 +1844,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } } @@ -2217,7 +2217,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime if ((x == 0) && (y == 0)) { - _log.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); + LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); return null; } @@ -2259,7 +2259,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } catch (Exception e) { - _log.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); + LOGGER.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); } return null; @@ -3150,7 +3150,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (!door.isOpen()) { @@ -3168,7 +3168,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (door.isOpen()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java index c25f5189f6..231cef15b4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public final class EventDispatcher { - private static final Logger _log = Logger.getLogger(EventDispatcher.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EventDispatcher.class.getName()); protected EventDispatcher() { @@ -83,7 +83,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -172,7 +172,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -237,7 +237,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java index 4b21e92c36..97dc1b1142 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class AnnotationEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(AnnotationEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnotationEventListener.class.getName()); private final Method _callback; public AnnotationEventListener(ListenersContainer container, EventType type, Method callback, Object owner, int priority) @@ -54,7 +54,7 @@ public class AnnotationEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java index 0d5b4a601c..56fb7b03ec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class FunctionEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(FunctionEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FunctionEventListener.class.getName()); private final Function _callback; @SuppressWarnings("unchecked") @@ -50,7 +50,7 @@ public class FunctionEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index cb65209f93..1501c166e8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public abstract class ItemContainer { - protected static final Logger _log = Logger.getLogger(ItemContainer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ItemContainer.class.getName()); protected final Map _items = new ConcurrentHashMap<>(); @@ -287,7 +287,7 @@ public abstract class ItemContainer final L2Item template = ItemTable.getInstance().getTemplate(itemId); if (template == null) { - _log.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); + LOGGER.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); return null; } @@ -702,7 +702,7 @@ public abstract class ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index cb2d9362ba..5bb5770412 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -139,7 +139,7 @@ public class Mail extends ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index 7fce82d4af..c7a3128aa9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; public class PcInventory extends Inventory { - private static final Logger _log = Logger.getLogger(PcInventory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PcInventory.class.getName()); private final L2PcInstance _owner; private L2ItemInstance _adena; @@ -761,7 +761,7 @@ public class PcInventory extends Inventory } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); } return paperdoll; } @@ -974,7 +974,7 @@ public class PcInventory extends Inventory { if ((type != EtcItemType.ARROW) && (type != EtcItemType.BOLT)) { - _log.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); + LOGGER.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java index 37e0216702..ded347d03a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java @@ -71,7 +71,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "addItem()", e); + LOGGER.log(Level.SEVERE, "addItem()", e); } } @@ -93,7 +93,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } _items.clear(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index a988fe1fec..c5a70ee9be 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.items.type.ItemType; */ public abstract class AbstractEnchantItem { - protected static final Logger _log = Logger.getLogger(AbstractEnchantItem.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); private static final ItemType[] ENCHANT_TYPES = new ItemType[] { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java index d4af9b02f5..2a7e5652dc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.holders.RangeChanceHolder; */ public final class EnchantItemGroup { - private static final Logger _log = Logger.getLogger(EnchantItemGroup.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); private final List _chances = new ArrayList<>(); private final String _name; @@ -68,10 +68,10 @@ public final class EnchantItemGroup return holder.getChance(); } } - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); return _chances.get(_chances.size() - 1).getChance(); } - _log.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); return -1; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index f7595701a1..98cb998ee2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -142,14 +142,14 @@ public final class EnchantScroll extends AbstractEnchantItem { if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) { - _log.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); return -1; } final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); if (group == null) { - _log.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); return -1; } return group.getChance(enchantItem.getEnchantLevel()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index f4525fdaaa..9b8fc50e17 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -1281,7 +1281,7 @@ public final class L2ItemInstance extends L2Object */ public static class ScheduleConsumeManaTask implements Runnable { - private static final Logger _log = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); private final L2ItemInstance _shadowItem; public ScheduleConsumeManaTask(L2ItemInstance item) @@ -1302,7 +1302,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 7556af343a..46097d99e5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public abstract class AbstractOlympiadGame { - protected static final Logger _log = Logger.getLogger(AbstractOlympiadGame.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractOlympiadGame.class.getName()); protected static final Logger _logResults = Logger.getLogger("olympiad"); protected static final String POINTS = "olympiad_points"; @@ -186,7 +186,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return false; } return true; @@ -287,7 +287,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -340,7 +340,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -387,7 +387,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "playerStatusBack()", e); + LOGGER.log(Level.WARNING, "playerStatusBack()", e); } } @@ -434,7 +434,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java index 6069b35ec8..714e479916 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OlympiadGameManager implements Runnable { - private static final Logger _log = Logger.getLogger(OlympiadGameManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlympiadGameManager.class.getName()); private static final int STADIUM_COUNT = 80; // TODO dynamic private volatile boolean _battleStarted = false; @@ -60,7 +60,7 @@ public class OlympiadGameManager implements Runnable _tasks.add(stadium); } - _log.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); + LOGGER.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); } public static OlympiadGameManager getInstance() @@ -188,7 +188,7 @@ public class OlympiadGameManager implements Runnable { OlympiadManager.getInstance().clearRegistered(); _battleStarted = false; - _log.info("Olympiad System: All current games finished."); + LOGGER.info("Olympiad System: All current games finished."); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 2108adfcb2..c82b326970 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -167,7 +167,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return false; } return result; @@ -388,7 +388,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (_playerTwo.isDefaulted()) @@ -415,7 +415,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (winside == 1) @@ -431,7 +431,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -536,7 +536,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -673,7 +673,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (SQLException e) { - _log.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); + LOGGER.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index d18e278286..8ef4db814e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class OlympiadGameTask implements Runnable { - protected static final Logger _log = Logger.getLogger(OlympiadGameTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(OlympiadGameTask.class.getName()); private static final int[] TELEPORT_TO_ARENA_TIMES = { @@ -163,7 +163,7 @@ public final class OlympiadGameTask implements Runnable { if ((game != null) && (_state != GameState.IDLE)) { - _log.warning("Attempt to overwrite non-finished game in state " + _state); + LOGGER.warning("Attempt to overwrite non-finished game in state " + _state); return; } @@ -352,14 +352,14 @@ public final class OlympiadGameTask implements Runnable case CLEANUP: case IDLE: { - _log.warning("Unable to return players back in town, exception: " + e.getMessage()); + LOGGER.warning("Unable to return players back in town, exception: " + e.getMessage()); _state = GameState.IDLE; _game = null; return; } } - _log.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); _state = GameState.GAME_STOPPED; ThreadPool.schedule(this, 1000); } @@ -417,7 +417,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -446,7 +446,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -463,7 +463,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; @@ -480,7 +480,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -489,7 +489,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -498,7 +498,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -507,7 +507,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -522,7 +522,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -531,7 +531,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -540,7 +540,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -549,7 +549,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -558,7 +558,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index d4720828f5..037b43e894 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; */ public class PunishmentTask implements Runnable { - protected static final Logger _log = Logger.getLogger(PunishmentTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PunishmentTask.class.getName()); private static final String INSERT_QUERY = "INSERT INTO punishments (`key`, `affect`, `type`, `expiration`, `reason`, `punishedBy`) VALUES (?, ?, ?, ?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE punishments SET expiration = ? WHERE id = ?"; @@ -203,7 +203,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); } } @@ -230,7 +230,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 495a0d648b..0a5994e0d5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class LongTimeEvent extends Quest { - protected Logger _log = Logger.getLogger(getClass().getName()); + protected Logger LOGGER = Logger.getLogger(getClass().getName()); protected String _eventName; boolean _enableShrines = false; @@ -86,17 +86,17 @@ public class LongTimeEvent extends Quest if (_eventPeriod.isWithinRange(new Date())) { startEvent(); - _log.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); + LOGGER.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); } else if (_eventPeriod.getStartDate().after(new Date())) { final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); - _log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); + LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } else { - _log.info("Event " + _eventName + " has passed... Ignored "); + LOGGER.info("Event " + _eventName + " has passed... Ignored "); } } } @@ -179,19 +179,19 @@ public class LongTimeEvent extends Quest if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); continue; } if (minCount > maxCount) { - _log.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); continue; } if ((finalChance < 10000) || (finalChance > 1000000)) { - _log.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); continue; } @@ -199,7 +199,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); } } } @@ -221,7 +221,7 @@ public class LongTimeEvent extends Quest if (NpcData.getInstance().getTemplate(npcId) == null) { - _log.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); + LOGGER.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); continue; } @@ -229,7 +229,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java index 511c4c829a..027cc94d3b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -86,7 +86,7 @@ import com.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class Quest extends AbstractScript implements IIdentifiable { - public static final Logger _log = Logger.getLogger(Quest.class.getName()); + public static final Logger LOGGER = Logger.getLogger(Quest.class.getName()); /** Map containing lists of timers from the name of the timer. */ private volatile Map> _questTimers = null; @@ -524,7 +524,7 @@ public class Quest extends AbstractScript implements IIdentifiable { showError(trigger.getActingPlayer(), e); } - _log.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); return; } if (trigger.getActingPlayer() != null) @@ -544,7 +544,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); } } @@ -559,7 +559,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); } } @@ -865,7 +865,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); } } @@ -934,7 +934,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); } } @@ -949,7 +949,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); } } @@ -964,7 +964,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); } } @@ -979,7 +979,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); } } @@ -996,7 +996,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); } return false; } @@ -1009,7 +1009,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); return; } } @@ -1514,10 +1514,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public boolean showError(L2PcInstance player, Throwable t) { - _log.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); + LOGGER.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); if (t.getMessage() == null) { - _log.warning(getClass().getSimpleName() + ": " + t.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + t.getMessage()); } if ((player != null) && player.getAccessLevel().isGm()) { @@ -1608,7 +1608,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - _log.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1639,7 +1639,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - _log.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); @@ -1657,7 +1657,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1681,7 +1681,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1704,7 +1704,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not update char quest:", e); + LOGGER.log(Level.WARNING, "could not update char quest:", e); } } @@ -1725,7 +1725,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Unable to delete char quest!", e); + LOGGER.log(Level.WARNING, "Unable to delete char quest!", e); } } @@ -1749,7 +1749,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete char quest:", e); + LOGGER.log(Level.WARNING, "could not delete char quest:", e); } } @@ -2805,7 +2805,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if ((id != 0) && (ItemTable.getInstance().getTemplate(id) == null)) { - _log.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); } } _questItemIds = items; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 23c0acc8d1..40aa1878fd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.util.Util; */ public final class QuestState { - protected static final Logger _log = Logger.getLogger(QuestState.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestState.class.getName()); /** The name of the quest of this QuestState */ private final String _questName; @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - _log.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - _log.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 64f6afb219..4013de0733 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class QuestTimer { - protected static final Logger _log = Logger.getLogger(QuestTimer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestTimer.class.getName()); public class ScheduleTimerTask implements Runnable { @@ -48,7 +48,7 @@ public class QuestTimer } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java index 64f04389a2..1c7ac4a6ab 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance; */ public class L2ShuttleEngine implements Runnable { - private static final Logger _log = Logger.getLogger(L2ShuttleEngine.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2ShuttleEngine.class.getName()); private static final int DELAY = 15 * 1000; @@ -117,7 +117,7 @@ public class L2ShuttleEngine implements Runnable } catch (Exception e) { - _log.log(Level.INFO, e.getMessage(), e); + LOGGER.log(Level.INFO, e.getMessage(), e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java index 6148235551..19a1a61b20 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Skill implements IIdentifiable { - private static final Logger _log = Logger.getLogger(Skill.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Skill.class.getName()); /** Skill ID. */ private final int _id; @@ -295,7 +295,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); + LOGGER.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); } } } @@ -426,7 +426,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); + LOGGER.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); } } } @@ -1139,7 +1139,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); } } activeChar.sendMessage("Target type of skill " + this + " is not currently handled."); @@ -1168,7 +1168,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); } } activeChar.sendMessage("Target affect scope of skill " + this + " is not currently handled."); @@ -1196,7 +1196,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); } } else @@ -1608,7 +1608,7 @@ public final class Skill implements IIdentifiable } else { - _log.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); + LOGGER.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 66b9f7e4b2..8e607be078 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SkillChannelizer implements Runnable { - private static final Logger _log = Logger.getLogger(SkillChannelizer.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SkillChannelizer.class.getName()); private final L2Character _channelizer; private List _channelized; @@ -72,7 +72,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); + LOGGER.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); return; } @@ -86,7 +86,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (!isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); + LOGGER.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); return; } @@ -192,7 +192,7 @@ public class SkillChannelizer implements Runnable final Skill channeledSkill = SkillData.getInstance().getSkill(skill.getChannelingSkillId(), skillLevel); if (channeledSkill == null) { - _log.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); + LOGGER.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); _channelizer.abortCast(); return; } @@ -229,7 +229,7 @@ public class SkillChannelizer implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); + LOGGER.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java index 7d6f856c18..8b91fc77d2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class AccountVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(AccountVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AccountVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM account_gsdata WHERE account_name = ?"; @@ -64,7 +64,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); return false; } finally @@ -107,7 +107,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); return false; } finally @@ -134,7 +134,7 @@ public class AccountVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); return false; } return true; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java index 390e2f166a..50fcf2ab6f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ClanVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ClanVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM clan_variables WHERE clanId = ?"; @@ -64,7 +64,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -107,7 +107,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -134,7 +134,7 @@ public class ClanVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java index bcd7f557fd..c7ba2ff071 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ItemVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ItemVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM item_variables WHERE id = ?"; @@ -69,7 +69,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); + LOGGER.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); return false; } return true; @@ -93,7 +93,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -136,7 +136,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -163,7 +163,7 @@ public class ItemVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java index 999b4cdd64..85508e687b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class PlayerVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(PlayerVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PlayerVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM character_variables WHERE charId = ?"; @@ -90,7 +90,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); return false; } finally @@ -133,7 +133,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); return false; } finally @@ -160,7 +160,7 @@ public class PlayerVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); return false; } return true; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java index 8a54b645b0..adfcec2ca5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java @@ -66,7 +66,7 @@ public abstract class L2ZoneRespawn extends L2ZoneType } default: { - _log.warning(getClass().getSimpleName() + ": Unknown location type: " + type); + LOGGER.warning(getClass().getSimpleName() + ": Unknown location type: " + type); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 3beea85891..a6790a61d9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public abstract class L2ZoneType extends ListenersContainer { - protected static final Logger _log = Logger.getLogger(L2ZoneType.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2ZoneType.class.getName()); private final int _id; protected L2ZoneForm _zone; @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - _log.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 043a66b6f4..33d3bb8723 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -113,7 +113,7 @@ public final class L2EffectZone extends L2ZoneType final String[] skillSplit = skill.split("-"); if (skillSplit.length != 2) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); } else { @@ -125,7 +125,7 @@ public final class L2EffectZone extends L2ZoneType { if (!skill.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/L2GameClient.java index 56940c6507..7cdbe1bb0a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -63,7 +63,7 @@ import io.netty.channel.ChannelHandlerContext; public final class L2GameClient extends ChannelInboundHandler { protected static final Logger LOGGER = Logger.getLogger(L2GameClient.class.getName()); - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private final int _objectId; @@ -111,13 +111,13 @@ public final class L2GameClient extends ChannelInboundHandler final InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); _addr = address.getAddress(); _channel = ctx.channel(); - LOG_ACCOUNTING.finer("Client Connected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Connected: " + ctx.channel()); } @Override public void channelInactive(ChannelHandlerContext ctx) { - LOG_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); LoginServerThread.getInstance().sendLogout(getAccountName()); IdFactory.getInstance().releaseId(getObjectId()); @@ -339,7 +339,7 @@ public final class L2GameClient extends ChannelInboundHandler } } - LOG_ACCOUNTING.info("Delete, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Delete, " + objectId + ", " + this); return CharacterDeleteFailType.NONE; } @@ -362,7 +362,7 @@ public final class L2GameClient extends ChannelInboundHandler LOGGER.log(Level.SEVERE, "Error restoring character.", e); } - LOG_ACCOUNTING.info("Restore, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Restore, " + objectId + ", " + this); } public static void deleteCharByObjId(int objid) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/NpcStringId.java index 150c39f2df..0525b279fe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/NpcStringId.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { - private static final Logger _log = Logger.getLogger(NpcStringId.class.getName()); + private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; private static Map VALUES = new HashMap<>(); @@ -39529,7 +39529,7 @@ public final class NpcStringId } catch (Exception e) { - _log.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); + LOGGER.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Action.java index f92d2c5e23..6c3399eea7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Action.java @@ -154,7 +154,7 @@ public final class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - _log.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); + LOGGER.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 3159a555e3..1ffd75d20c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -58,7 +58,7 @@ public final class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - _log.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +68,7 @@ public final class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - _log.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 2471b37509..969aea0360 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.util.Util; @SuppressWarnings("unused") public final class CharacterCreate implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cSdddddddddddd private String _name; @@ -124,7 +124,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - _log.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -132,7 +132,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - _log.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -140,7 +140,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairColor > 3) || (_hairColor < 0)) { - _log.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -252,7 +252,7 @@ public final class CharacterCreate implements IClientIncomingPacket initNewChar(client, newChar); - LOG_ACCOUNTING.info("Created new character, " + newChar + ", " + client); + LOGGER_ACCOUNTING.info("Created new character, " + newChar + ", " + client); } private static boolean isValidName(String text) @@ -308,7 +308,7 @@ public final class CharacterCreate implements IClientIncomingPacket final L2ItemInstance item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - _log.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index cd62eefdba..1dab2d81f8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -75,7 +75,7 @@ public final class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error:", e); + LOGGER.log(Level.SEVERE, "Error:", e); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index c7b59f3d6d..3d0b8dfcb3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ServerClose; */ public class CharacterSelect implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cd private int _charSlot; @@ -175,7 +175,7 @@ public class CharacterSelect implements IClientIncomingPacket client.getActiveCharLock().unlock(); } - LOG_ACCOUNTING.info("Logged in, " + client); + LOGGER_ACCOUNTING.info("Logged in, " + client); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5c18755798..689f42e143 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public final class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = activeChar.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - _log.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } activeChar.stopMovie(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 1597cb50b4..1ed25d2f2e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -142,7 +142,7 @@ public class EnterWorld implements IClientIncomingPacket final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { - _log.warning("EnterWorld failed! activeChar returned 'null'."); + LOGGER.warning("EnterWorld failed! activeChar returned 'null'."); Disconnection.of(client).defaultSequence(false); return; } @@ -173,7 +173,7 @@ public class EnterWorld implements IClientIncomingPacket // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) // { - // _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); + // LOGGER.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); // } if (Config.PVP_COLOR_SYSTEM_ENABLED && !Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 29a07243b9..7638c7332e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -43,9 +43,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("[T1:ExGetOnAirShip] x: " + _x); - _log.info("[T1:ExGetOnAirShip] y: " + _y); - _log.info("[T1:ExGetOnAirShip] z: " + _z); - _log.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + 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); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index 4f62846be3..c9f4c0b539 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index 472f1051b3..b0f55887ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -27,5 +27,5 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger _log = Logger.getLogger(IClientIncomingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java index 8b2f68f220..d29291657e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class Logout implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -55,7 +55,7 @@ public final class Logout implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 3a681a986e..e3a9140189 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -147,7 +147,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - _log.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -155,14 +155,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) { - _log.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - _log.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -190,7 +190,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - _log.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -355,7 +355,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -453,7 +453,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -616,7 +616,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c9e6a88cec..6d400a1191 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.KeyPacket; */ public final class ProtocolVersion implements IClientIncomingPacket { - private static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + private static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private int _version; @@ -51,7 +51,7 @@ public final class ProtocolVersion implements IClientIncomingPacket } else if (!Config.PROTOCOL_LIST.contains(_version)) { - LOG_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); + LOGGER_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); client.setProtocolOk(false); client.close(new KeyPacket(client.enableCrypt(), 0)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a00277486a..9990a21411 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -106,7 +106,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 32000)) { Util.handleIllegalPlayerAction(activeChar, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - _log.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); return; } @@ -125,7 +125,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - _log.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -135,7 +135,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); return; } @@ -517,7 +517,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } default: { - _log.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index daaae05884..4feb5ae11d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -56,7 +56,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -80,7 +80,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - _log.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } @@ -90,11 +90,11 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); } else if (prevSkillLevel != (_level - 1)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index baddc853ee..b54bca60ed 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -93,7 +93,7 @@ public final class RequestActionUse implements IClientIncomingPacket if (!(Arrays.binarySearch(allowedActions, _actionId) >= 0)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); + LOGGER.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); return; } } @@ -143,7 +143,7 @@ public final class RequestActionUse implements IClientIncomingPacket } default: { - _log.warning(activeChar.getName() + ": unhandled action type " + _actionId); + LOGGER.warning(activeChar.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 01c8b0c67f..138c70f9d8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -131,7 +131,7 @@ public final class RequestBlock implements IClientIncomingPacket } default: { - _log.info("Unknown 0xA9 block type: " + _type); + LOGGER.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index df1cc723fd..4662619a4a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -161,7 +161,7 @@ public final class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - _log.warning("ERROR, no price found .. wrong buylist ??"); + LOGGER.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index a85b1019cc..7621a7029e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -86,7 +86,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty bypass!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty bypass!"); Disconnection.of(client, activeChar).defaultSequence(false); return; } @@ -107,7 +107,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket bypassOriginId = activeChar.validateHtmlAction(_command); if (bypassOriginId == -1) { - _log.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); + LOGGER.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); return; } @@ -192,7 +192,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); } } else if (_command.startsWith("_match")) @@ -285,13 +285,13 @@ public final class RequestBypassToServer implements IClientIncomingPacket } else { - _log.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - _log.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); + LOGGER.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); if (activeChar.isGM()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 8d17f67975..61b88962de 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -61,7 +61,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket if (activeChar == null) { - _log.finer("RequestCrystalizeItem: activeChar was null"); + LOGGER.finer("RequestCrystalizeItem: activeChar was null"); return; } @@ -90,7 +90,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((activeChar.getRace() != Race.DWARF) && (activeChar.getClassId().ordinal() != 117) && (activeChar.getClassId().ordinal() != 55)) { - _log.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); + LOGGER.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); } return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index f48efc3a6d..9805ae3e39 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -171,7 +171,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not delete pet objectid: ", e); + LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 2c89d4fd7e..33c87254a1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -185,7 +185,7 @@ public final class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - _log.warning(msg); + LOGGER.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index ac44a0a77b..2bbdb8626a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -42,6 +42,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 27e73c4de3..94fc6eac8a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -74,7 +74,7 @@ public final class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - _log.warning("Wrong Cube Game Team ID: " + _team); + LOGGER.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index ca230610ed..ea96e75807 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -64,7 +64,7 @@ public final class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - _log.warning("Unknown Cube Game Answer ID: " + _answer); + LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index 2aac09d8a2..87679b1211 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -34,6 +34,6 @@ public final class RequestExFishRanking implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestExFishRanking"); + LOGGER.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 1690c6d2f0..412be1caa7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -87,7 +87,7 @@ public final class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 31e55b54f3..0937ce580d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -72,7 +72,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - _log.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 352bc99c12..c031e965ea 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -43,7 +43,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - _log.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); + LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); if (client.getActiveChar() == null) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index 8c3b8157b7..d480f5057e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -44,6 +44,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - _log.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + LOGGER.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index ffc9040acd..0feb646e91 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -79,7 +79,7 @@ public final class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index ee5433c9e0..186e2f91a4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -119,7 +119,7 @@ public final class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 431f1db994..0f0b002fed 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -72,7 +72,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 4055e9b188..016c2378d4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -52,7 +52,7 @@ public final class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - _log.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); } client.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 6950da9b0c..a9704d4032 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -50,7 +50,7 @@ public final class RequestHennaItemRemoveInfo implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 0e427d5138..7c62b7cd89 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -75,7 +75,7 @@ public final class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - _log.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); + LOGGER.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); client.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index d8a598fa60..53afe57b35 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -49,20 +49,20 @@ public final class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - _log.warning("Player " + actor.getName() + " sent empty html link!"); + LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - _log.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - _log.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 3d797b889a..c8a621359f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -50,7 +50,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (activeChar.getObjectId() != _objectId) { - _log.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + LOGGER.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 1f6b539929..cab42128f7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public final class RequestMagicSkillUse implements IClientIncomingPacket activeChar.sendPacket(ActionFailed.STATIC_PACKET); if (_magicId > 0) { - _log.warning("Skill Id " + _magicId + " not found in player: " + activeChar); + LOGGER.warning("Skill Id " + _magicId + " not found in player: " + activeChar); } return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 0ab61c25b8..11ed417b33 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -72,7 +72,7 @@ public final class RequestOustPledgeMember implements IClientIncomingPacket final L2ClanMember member = clan.getClanMember(_target); if (member == null) { - _log.warning("Target (" + _target + ") is not member of the clan"); + LOGGER.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayerInstance().isInCombat()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index b703480e20..b87741c610 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -37,6 +37,6 @@ public final class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestPCCafeCouponUse: S: " + _str); + LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index aa71b73eb6..05962263f7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -119,7 +119,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -168,7 +168,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -176,7 +176,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 9ef482c27c..57d27eec76 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -136,7 +136,7 @@ public final class RequestPetUseItem implements IClientIncomingPacket else { activeChar.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - _log.warning("No item handler registered for itemId: " + item.getId()); + LOGGER.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index deef71c1ba..29ab10a108 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -74,7 +74,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - _log.severe("Error while saving petition feedback"); + LOGGER.severe("Error while saving petition feedback"); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 7e97a40c3f..432d30d9aa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -74,7 +74,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -153,7 +153,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket final L2MerchantInstance merchant = (target instanceof L2MerchantInstance) ? (L2MerchantInstance) target : null; if (merchant == null) { - _log.warning("Null merchant!"); + LOGGER.warning("Null merchant!"); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index b6f2892f96..a20bb3d197 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -160,7 +160,7 @@ public final class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - _log.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index d61109b205..d76415c39f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -144,7 +144,7 @@ public final class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9ab82245e8..01373d760d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -194,7 +194,7 @@ public final class RequestRefundItem implements IClientIncomingPacket final L2ItemInstance item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - _log.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); continue; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 8b253257c5..1a4ea38608 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack } else { - _log.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } activeChar.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 23c4edd13c..f8749dfd8b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class RequestRestart implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -58,7 +58,7 @@ public final class RequestRestart implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 7ba8a189b4..e08c984b59 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -91,7 +91,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else if (!activeChar.isDead()) { - _log.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); + LOGGER.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); return; } @@ -143,7 +143,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getHideoutId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CLANHALL); @@ -171,7 +171,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -194,7 +194,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getFortId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.FORTRESS); @@ -223,7 +223,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.SIEGEFLAG); @@ -233,7 +233,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if (!activeChar.isGM() && !activeChar.getInventory().haveItemForSelfResurrection()) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (activeChar.isGM() || activeChar.destroyItemByItemId("Feather", 10649, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13300, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13128, 1, activeChar, false)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9cbb114e88..e53df987df 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -323,14 +323,14 @@ public final class RequestSendPost implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - _log.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final L2ItemInstance newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - _log.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 092a91fe40..5e2215c60a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -54,17 +54,17 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((activeChar == null) || (castle == null)) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != activeChar.getClanId())) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); return; } else if (!activeChar.isClanLeader()) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); return; } else if (!castle.getIsTimeRegistrationOver()) @@ -81,12 +81,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index a6beb4572f..53fd80604a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -109,7 +109,7 @@ public final class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - _log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); + LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -117,7 +117,7 @@ public final class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - _log.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); + LOGGER.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -224,7 +224,7 @@ public final class Say2 implements IClientIncomingPacket } else { - _log.info("No handler registered for ChatType: " + _type + " Player: " + client); + LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -271,7 +271,7 @@ public final class Say2 implements IClientIncomingPacket if (item == null) { - _log.info(client + " trying publish item which doesnt own! ID:" + id); + LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -279,7 +279,7 @@ public final class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - _log.info(client + " sent invalid publish item msg! ID:" + id); + LOGGER.info(client + " sent invalid publish item msg! ID:" + id); return false; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 84eccf9f7a..2255ca3502 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -67,14 +67,14 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket activeChar.sendMessage("The command " + command.substring(6) + " does not exists!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 60c0402b18..237686ac3b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -128,7 +128,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -175,7 +175,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -187,7 +187,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 9c76eb1086..dc8836ed4b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -167,13 +167,13 @@ public final class SendWareHouseWithDrawList implements IClientIncomingPacket final L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final L2ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java index 5999d7d02c..8ae98bd315 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -272,7 +272,7 @@ public final class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(activeChar, item, _ctrlPressed)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java index 1441d46716..622d6d2d7f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java @@ -64,8 +64,8 @@ public class ValidatePosition implements IClientIncomingPacket if (Config.DEVELOPER) { - _log.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); - _log.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); + LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); + LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); } if ((_x == 0) && (_y == 0)) @@ -191,7 +191,7 @@ public class ValidatePosition implements IClientIncomingPacket { if (Config.DEVELOPER) { - _log.info(activeChar.getName() + ": Synchronizing position Server --> Client"); + LOGGER.info(activeChar.getName() + ": Synchronizing position Server --> Client"); } activeChar.sendPacket(new ValidateLocation(activeChar)); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index b919b3b868..581b420ff0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -57,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - _log.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - _log.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((activeChar.getAbilityPoints() == 0) || (activeChar.getAbilityPoints() == activeChar.getAbilityPointsUsed())) { - _log.warning("Player " + activeChar + " is trying to learn ability without ability points!"); + LOGGER.warning("Player " + activeChar + " is trying to learn ability without ability points!"); return; } @@ -115,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final L2SkillLearn learn = SkillTreesData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - _log.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -123,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - _log.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - _log.warning("Player " + activeChar + " is trying to learn " + skill + " without enough ability points spent!"); + LOGGER.warning("Player " + activeChar + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (activeChar.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - _log.warning("Player " + activeChar + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + LOGGER.warning("Player " + activeChar + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((activeChar.getAbilityPoints() - activeChar.getAbilityPointsUsed()) < points) { - _log.warning("Player " + activeChar + " is trying to learn ability without ability points!"); + LOGGER.warning("Player " + activeChar + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 414e817ffe..fde25d4736 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -95,7 +95,7 @@ public class RequestAlchemyConversion implements IClientIncomingPacket final AlchemyCraftData data = AlchemyData.getInstance().getCraftData(_skillId, _skillLevel); if (data == null) { - _log.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 8cf9b2f3b5..8cf139d7c4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -57,7 +57,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_durationType < 0) || (_durationType > 3)) { - _log.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 659b237448..5e0ad65f1a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -101,7 +101,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning(activeChar + ": tried to crystallize " + item.getItem()); + LOGGER.warning(activeChar + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 076d40a420..a2d7c3bba4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -102,7 +102,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); } } else diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index faeca65fce..03435f7f4d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -101,7 +101,7 @@ public final class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not del friend objectid: ", e); + LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 29a252aa5e..94715a15c1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -94,7 +94,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index c51d4f158a..de2ad9cf73 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -77,7 +77,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - _log.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index a7553a343f..5d89208157 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -61,7 +61,7 @@ public final class RequestBRProductList implements IClientIncomingPacket } default: { - _log.warning(player + " send unhandled product list type: " + _type); + LOGGER.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index 50b48de960..7c1b5ab107 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -71,7 +71,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { activeChar.sendMessage("That zone is not supported yet!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); return; } @@ -79,7 +79,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { activeChar.sendMessage("This zone is not handled yet!!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index 4c9c106a52..b6ac83ea82 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -60,7 +60,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket activeChar.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - _log.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); + LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java index eb24a578fb..9d28cd837c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java @@ -29,7 +29,7 @@ import com.l2jmobius.commons.network.BaseSendablePacket; */ public class BlowFishKey extends BaseSendablePacket { - private static Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param blowfishKey @@ -48,7 +48,7 @@ public class BlowFishKey extends BaseSendablePacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index d7f5a56cb6..4b509229e8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -75,7 +75,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - _log.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); _html = html.substring(0, 17200); } @@ -93,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - _log.warning("missing html page " + path); + LOGGER.warning("missing html page " + path); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index df42fbe646..10ce97b46c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -135,7 +135,7 @@ public abstract class AbstractMessagePacket> // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - _log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 58bbb84eef..2538126f0a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { - private static Logger _log = Logger.getLogger(CharSelectionInfo.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); private final String _loginName; private final int _sessionId; private int _activeId; @@ -241,7 +241,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } return new CharSelectInfoPackage[0]; } @@ -266,7 +266,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); } } @@ -378,7 +378,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 36ef7cd289..1c046a085c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -46,7 +46,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 03c64d3f83..a90b288eb1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -44,7 +44,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index ef264eb715..4c7aa6f70c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -54,7 +54,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - _log.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + LOGGER.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_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 8b2fe9aa5e..ba2ae9f9f1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger _log = Logger.getLogger(IClientOutgoingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); int[] PAPERDOLL_ORDER = new int[] { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index f21611bb50..d0f43d0ffe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -56,7 +56,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - _log.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 9a47f0c939..a6566b4986 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -77,7 +77,7 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - _log.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); + LOGGER.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 44a9997fb2..562b2ccd31 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -78,7 +78,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - _log.warning("Null owner for castle: " + _castle.getName()); + LOGGER.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 1082f31974..77c787e1be 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -55,7 +55,7 @@ public final class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_activeChar.getActiveWarehouse() == null) { - _log.warning("error while sending withdraw request to: " + _activeChar.getName()); + LOGGER.warning("error while sending withdraw request to: " + _activeChar.getName()); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/DateRange.java index 3b8acae352..1a16f0bd49 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/DateRange.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; */ public class DateRange { - protected static final Logger _log = Logger.getLogger(DateRange.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(DateRange.class.getName()); private final Date _startDate, _endDate; public DateRange(Date from, Date to) @@ -47,7 +47,7 @@ public class DateRange } catch (ParseException e) { - _log.log(Level.WARNING, "Invalid Date Format.", e); + LOGGER.log(Level.WARNING, "Invalid Date Format.", e); } } return new DateRange(null, null); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/ScriptDocument.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/ScriptDocument.java index eacfe5baf8..672c90e094 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/ScriptDocument.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/ScriptDocument.java @@ -33,7 +33,7 @@ import org.xml.sax.SAXException; */ public class ScriptDocument { - private static final Logger _log = Logger.getLogger(ScriptDocument.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScriptDocument.class.getName()); private Document _document; private final String _name; @@ -57,17 +57,17 @@ public class ScriptDocument { x = sxe.getException(); } - _log.warning(getClass().getSimpleName() + ": " + x.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + x.getMessage()); } catch (ParserConfigurationException pce) { // Parser with specified options can't be built - _log.log(Level.WARNING, "", pce); + LOGGER.log(Level.WARNING, "", pce); } catch (IOException ioe) { // I/O error - _log.log(Level.WARNING, "", ioe); + LOGGER.log(Level.WARNING, "", ioe); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 1779779829..8344576a3e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SecondaryPasswordAuth { - private final Logger _log = Logger.getLogger(SecondaryPasswordAuth.class.getName()); + private final Logger LOGGER = Logger.getLogger(SecondaryPasswordAuth.class.getName()); private final L2GameClient _activeClient; private String _password; @@ -96,7 +96,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); } } @@ -104,7 +104,7 @@ public class SecondaryPasswordAuth { if (passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -127,7 +127,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing password.", e); + LOGGER.log(Level.SEVERE, "Error while writing password.", e); return false; } _password = password; @@ -147,7 +147,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing wrong attempts.", e); + LOGGER.log(Level.SEVERE, "Error while writing wrong attempts.", e); return false; } return true; @@ -157,7 +157,7 @@ public class SecondaryPasswordAuth { if (!passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -185,7 +185,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); return false; } @@ -210,7 +210,7 @@ public class SecondaryPasswordAuth { LoginServerThread.getInstance().sendTempBan(_activeClient.getAccountName(), _activeClient.getConnectionAddress().getHostAddress(), SecondaryAuthData.getInstance().getBanTime()); LoginServerThread.getInstance().sendMail(_activeClient.getAccountName(), "SATempBan", _activeClient.getConnectionAddress().getHostAddress(), Integer.toString(SecondaryAuthData.getInstance().getMaxAttempts()), Long.toString(SecondaryAuthData.getInstance().getBanTime()), SecondaryAuthData.getInstance().getRecoveryLink()); - _log.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); + LOGGER.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); insertWrongAttempt(0); _activeClient.close(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_BAN, SecondaryAuthData.getInstance().getMaxAttempts())); } @@ -258,11 +258,11 @@ public class SecondaryPasswordAuth } catch (NoSuchAlgorithmException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); } catch (UnsupportedEncodingException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Encoding"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Encoding"); } return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index 9f26c91ac6..49f8a70c08 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; */ public class AttackStanceTaskManager { - protected static final Logger _log = Logger.getLogger(AttackStanceTaskManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AttackStanceTaskManager.class.getName()); protected static final Map _attackStanceTasks = new ConcurrentHashMap<>(); @@ -132,7 +132,7 @@ public class AttackStanceTaskManager catch (Exception e) { // Unless caught here, players remain in attack positions. - _log.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Broadcast.java index 419eb6295a..dfaa95d5d0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Broadcast.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.RelationChanged; */ public final class Broadcast { - private static Logger _log = Logger.getLogger(Broadcast.class.getName()); + private static Logger LOGGER = Logger.getLogger(Broadcast.class.getName()); /** * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character that have the Character targeted.
@@ -101,7 +101,7 @@ public final class Broadcast } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } }); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Evolve.java index 7fae394d24..66a22f62fd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/Evolve.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class Evolve { - protected static final Logger _log = Logger.getLogger(Evolve.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Evolve.class.getName()); public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) { @@ -287,7 +287,7 @@ public final class Evolve } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } @@ -314,7 +314,7 @@ public final class Evolve } catch (Throwable e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java index f005fca2ea..7c4f9c2185 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -40,7 +40,7 @@ public final class FloodProtectorAction /** * Logger */ - private static final Logger _log = Logger.getLogger(FloodProtectorAction.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectorAction.class.getName()); /** * Client for this instance of flood protector. */ @@ -94,7 +94,7 @@ public final class FloodProtectorAction if ((curTick < _nextGameTick) || _punishmentInProgress) { - if (_config.LOG_FLOODING && !_logged && _log.isLoggable(Level.WARNING)) + if (_config.LOG_FLOODING && !_logged && LOGGER.isLoggable(Level.WARNING)) { log(" called command ", command, " ~", String.valueOf((_config.FLOOD_PROTECTION_INTERVAL - (_nextGameTick - curTick)) * GameTimeController.MILLIS_IN_TICK), " ms after previous command"); _logged = true; @@ -124,7 +124,7 @@ public final class FloodProtectorAction return false; } - if ((_count.get() > 0) && _config.LOG_FLOODING && _log.isLoggable(Level.WARNING)) + if ((_count.get() > 0) && _config.LOG_FLOODING && LOGGER.isLoggable(Level.WARNING)) { log(" issued ", String.valueOf(_count), " extra requests within ~", String.valueOf(_config.FLOOD_PROTECTION_INTERVAL * GameTimeController.MILLIS_IN_TICK), " ms"); } @@ -142,7 +142,7 @@ public final class FloodProtectorAction { Disconnection.of(_client).defaultSequence(false); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log("kicked for flooding"); } @@ -154,7 +154,7 @@ public final class FloodProtectorAction private void banAccount() { PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -176,7 +176,7 @@ public final class FloodProtectorAction PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" jailed for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -238,6 +238,6 @@ public final class FloodProtectorAction Arrays.stream(lines).forEach(output::append); - _log.warning(output.toString()); + LOGGER.warning(output.toString()); } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/GMAudit.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/GMAudit.java index c2ee25069b..c2a5593953 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/GMAudit.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/GMAudit.java @@ -31,7 +31,7 @@ import com.l2jmobius.Config; */ public class GMAudit { - private static final Logger _log = Logger.getLogger(GMAudit.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GMAudit.class.getName()); static { new File("log/GMAudit").mkdirs(); @@ -61,7 +61,7 @@ public class GMAudit } catch (IOException e) { - _log.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); + LOGGER.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 5fea4905d6..e5991a5546 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public final class OfflineTradeUtil { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private OfflineTradeUtil() { @@ -145,7 +145,7 @@ public final class OfflineTradeUtil } Disconnection.of(player).storeMe().close(false); - LOG_ACCOUNTING.info("Entering offline mode, " + client); + LOGGER_ACCOUNTING.info("Entering offline mode, " + client); return true; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/FloodProtectedListener.java index df39b38769..d046a0f65c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import com.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger _log = Logger.getLogger(FloodProtectedListener.class.getName()); + private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map _floodProtection = new ConcurrentHashMap<>(); private ServerSocket _serverSocket; @@ -70,7 +70,7 @@ public abstract class FloodProtectedListener extends Thread fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) { - _log.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); + LOGGER.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); } fConnection.isFlooding = true; continue; @@ -78,7 +78,7 @@ public abstract class FloodProtectedListener extends Thread if (fConnection.isFlooding) // if connection was flooding server but now passed the check { fConnection.isFlooding = false; - _log.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); + LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } fConnection.lastConnection = System.currentTimeMillis(); } @@ -102,7 +102,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException io) { - _log.log(Level.INFO, "", io); + LOGGER.log(Level.INFO, "", io); } break; } @@ -145,7 +145,7 @@ public abstract class FloodProtectedListener extends Thread } else { - _log.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); + LOGGER.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); } } @@ -157,7 +157,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java index 767e0b2326..78eadc9019 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters; */ public class GameServerThread extends Thread { - protected static final Logger _log = Logger.getLogger(GameServerThread.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GameServerThread.class.getName()); private final Socket _connection; private InputStream _in; private OutputStream _out; @@ -69,7 +69,7 @@ public class GameServerThread extends Thread _connectionIPAddress = _connection.getInetAddress().getHostAddress(); if (GameServerThread.isBannedGameserverIP(_connectionIPAddress)) { - _log.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); + LOGGER.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); forceClose(LoginServerFail.REASON_IP_BANNED); // ensure no further processing for this connection return; @@ -92,7 +92,7 @@ public class GameServerThread extends Thread if ((lengthHi < 0) || _connection.isClosed()) { - _log.finer("LoginServerThread: Login terminated the connection."); + LOGGER.finer("LoginServerThread: Login terminated the connection."); break; } @@ -110,7 +110,7 @@ public class GameServerThread extends Thread if (receivedBytes != (length - 2)) { - _log.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); + LOGGER.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); break; } @@ -119,7 +119,7 @@ public class GameServerThread extends Thread checksumOk = NewCrypt.verifyChecksum(data); if (!checksumOk) { - _log.warning("Incorrect packet checksum, closing connection (LS)"); + LOGGER.warning("Incorrect packet checksum, closing connection (LS)"); return; } @@ -130,14 +130,14 @@ public class GameServerThread extends Thread { final String serverName = getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"; final String msg = "GameServer " + serverName + ": Connection lost: " + e.getMessage(); - _log.info(msg); + LOGGER.info(msg); } finally { if (isAuthed()) { _gsi.setDown(); - _log.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); + LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); @@ -185,7 +185,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); + LOGGER.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); } } @@ -209,7 +209,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final ScrambledKeyPair pair = LoginController.getInstance().getScrambledRSAKeyPair(); _privateKey = (RSAPrivateKey) pair.getPrivateKey(); @@ -241,7 +241,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.severe("IOException while sending packet " + sl.getClass().getSimpleName()); + LOGGER.severe("IOException while sending packet " + sl.getClass().getSimpleName()); } } @@ -265,7 +265,7 @@ public class GameServerThread extends Thread */ public void setGameHosts(String[] hosts) { - _log.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); + LOGGER.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); _gsi.clearServerAddresses(); for (int i = 0; i < hosts.length; i += 2) @@ -276,13 +276,13 @@ public class GameServerThread extends Thread } catch (Exception e) { - _log.warning("Couldn't resolve hostname \"" + e + "\""); + LOGGER.warning("Couldn't resolve hostname \"" + e + "\""); } } for (String s : _gsi.getServerAddresses()) { - _log.info(s); + LOGGER.info(s); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/L2LoginServer.java index bad76dd97c..b87afbb356 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/L2LoginServer.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; */ public final class L2LoginServer { - private final Logger _log = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; private static L2LoginServer _instance; @@ -77,7 +77,7 @@ public final class L2LoginServer } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Load Config @@ -92,7 +92,7 @@ public final class L2LoginServer } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); System.exit(1); } @@ -104,11 +104,11 @@ public final class L2LoginServer { _gameServerListener = new GameServerListener(); _gameServerListener.start(); - _log.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); + LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); } catch (IOException e) { - _log.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); System.exit(1); } @@ -148,7 +148,7 @@ public final class L2LoginServer } catch (NumberFormatException nfe) { - _log.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); return; } } @@ -159,25 +159,25 @@ public final class L2LoginServer } catch (UnknownHostException e) { - _log.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); } }); //@formatter:on } catch (IOException e) { - _log.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); } - _log.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); + LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); } else { - _log.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); + LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); } if (Config.LOGIN_SERVER_SCHEDULE_RESTART) { - _log.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); + LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); _restartLoginServer = new LoginServerRestart(); _restartLoginServer.setDaemon(true); _restartLoginServer.start(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/LoginController.java index ff547092da..a896c7fd7a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/LoginController.java @@ -51,7 +51,7 @@ import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason public class LoginController { - protected static final Logger _log = Logger.getLogger(LoginController.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(LoginController.class.getName()); private static LoginController _instance; @@ -78,7 +78,7 @@ public class LoginController private LoginController() throws GeneralSecurityException { - _log.info("Loading LoginController..."); + LOGGER.info("Loading LoginController..."); _keyPairs = new ScrambledKeyPair[10]; _blowfishKeyGenerator = KeyGenerator.getInstance("Blowfish"); @@ -91,7 +91,7 @@ public class LoginController _keyPairs[i] = new ScrambledKeyPair(rsaKeyPairGenerator.generateKeyPair()); } - _log.info("Cached 10 KeyPairs for RSA communication."); + LOGGER.info("Cached 10 KeyPairs for RSA communication."); final Thread purge = new PurgeThread(); purge.setDaemon(true); @@ -156,7 +156,7 @@ public class LoginController addBanForAddress(addr, Config.LOGIN_BLOCK_AFTER_BAN * 1000); // we need to clear the failed login attempts here, so after the ip ban is over the client has another 5 attempts clearFailedLoginAttemps(addr); - _log.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); + LOGGER.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); } } @@ -218,16 +218,16 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); return null; } - _log.info("Auto created account '" + login + "'."); + LOGGER.info("Auto created account '" + login + "'."); return retriveAccountInfo(addr, login, password, false); } catch (Exception e) { - _log.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); return null; } } @@ -301,7 +301,7 @@ public class LoginController if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); - _log.info("Removed expired ip address ban " + address.getHostAddress() + "."); + LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); return false; } return true; @@ -414,7 +414,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); } } return loginOk; @@ -433,7 +433,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); } } @@ -452,7 +452,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); } } @@ -532,13 +532,13 @@ public class LoginController { if (!ipWhiteList.isEmpty() && !ipWhiteList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); return false; } if (!ipBlackList.isEmpty() && ipBlackList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); return false; } } @@ -558,7 +558,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not finish login process!", e); + LOGGER.log(Level.WARNING, "Could not finish login process!", e); return false; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java index 83ad61827b..bfa7e9dc02 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class L2JGameServerPacketHandler { - protected static Logger _log = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); + protected static Logger LOGGER = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); public enum GameServerState { @@ -65,7 +65,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -83,7 +83,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -146,7 +146,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2LoginClient.java index c4f45ea59b..da20164f21 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -46,7 +46,7 @@ import io.netty.channel.ChannelHandlerContext; */ public final class L2LoginClient extends ChannelInboundHandler { - private static final Logger _log = Logger.getLogger(L2LoginClient.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2LoginClient.class.getName()); // Crypt private final ScrambledKeyPair _scrambledPair; @@ -105,7 +105,7 @@ public final class L2LoginClient extends ChannelInboundHandler } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java index 1cd1aceac3..e48d751a7a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java @@ -46,7 +46,7 @@ import com.l2jmobius.loginserver.network.serverpackets.ServerList; */ public class RequestAuthLogin implements IIncomingPacket { - private static Logger _log = Logger.getLogger(RequestAuthLogin.class.getName()); + private static Logger LOGGER = Logger.getLogger(RequestAuthLogin.class.getName()); private final byte[] _raw1 = new byte[128]; private final byte[] _raw2 = new byte[128]; @@ -89,7 +89,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (GeneralSecurityException e) { - _log.log(Level.INFO, "", e); + LOGGER.log(Level.INFO, "", e); return; } @@ -108,7 +108,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java index 6abfe18518..a68b2053a7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java @@ -32,7 +32,7 @@ import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerSt */ public class BlowFishKey extends BaseRecievePacket { - protected static final Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param decrypt @@ -67,7 +67,7 @@ public class BlowFishKey extends BaseRecievePacket } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java index 03ff8df8d3..4e0c492ffa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java @@ -27,7 +27,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class ChangeAccessLevel extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangeAccessLevel.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangeAccessLevel.class.getName()); /** * @param decrypt @@ -40,6 +40,6 @@ public class ChangeAccessLevel extends BaseRecievePacket final String account = readS(); LoginController.getInstance().setAccountAccessLevel(account, level); - _log.info("Changed " + account + " access level to " + level); + LOGGER.info("Changed " + account + " access level to " + level); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java index d4c10be532..69ba99271d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java @@ -35,7 +35,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ChangePassword extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangePassword.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangePassword.class.getName()); private static GameServerThread gst = null; public ChangePassword(byte[] decrypt) @@ -103,7 +103,7 @@ public class ChangePassword extends BaseRecievePacket passUpdated = ps.executeUpdate(); } - _log.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); + LOGGER.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); if (passUpdated > 0) { gst.ChangePasswordResponse((byte) 1, characterName, "You have successfully changed your password!"); @@ -120,7 +120,7 @@ public class ChangePassword extends BaseRecievePacket } catch (Exception e) { - _log.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); + LOGGER.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java index 2154becbb5..153a4cd86d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class GameServerAuth extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(GameServerAuth.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GameServerAuth.class.getName()); GameServerThread _server; private final byte[] _hexId; private final int _desiredId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java index 194d82d565..baa6528090 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerLogout extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerLogout.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerLogout.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java index 69c263628b..542848f6e6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class PlayerTracert extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerTracert.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerTracert.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java index 1a76467686..f9a24a80d8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java @@ -31,7 +31,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class RequestTempBan extends BaseRecievePacket { - private static final Logger _log = Logger.getLogger(RequestTempBan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RequestTempBan.class.getName()); private final String _accountName; @SuppressWarnings("unused") @@ -69,7 +69,7 @@ public class RequestTempBan extends BaseRecievePacket } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } try diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java index 6c7aed04d5..155d19688d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java @@ -28,7 +28,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ServerStatus extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ServerStatus.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ServerStatus.class.getName()); public static final int SERVER_LIST_STATUS = 0x01; public static final int SERVER_TYPE = 0x02; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java index cc2a6c0c2f..2a71996141 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -61,7 +61,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; */ public final class ServerList implements IOutgoingPacket { - protected static final Logger _log = Logger.getLogger(ServerList.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ServerList.class.getName()); private final List _servers; private final int _lastServer; @@ -89,7 +89,7 @@ public final class ServerList implements IOutgoingPacket } catch (UnknownHostException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); _ip = new byte[4]; _ip[0] = 127; _ip[1] = 0; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java index 593e01a15d..887e4f715c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; */ public class IPv4Filter implements Runnable { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final HashMap _ipFloodMap; private static final long SLEEP_TIME = 5000; @@ -69,7 +69,7 @@ public class IPv4Filter implements Runnable final InetAddress addr = sc.socket().getInetAddress(); if (!(addr instanceof Inet4Address)) { - _log.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); + LOGGER.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/DenOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/DenOfEvil.java index bdf4d1063c..e4d5d3de37 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/DenOfEvil.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/DenOfEvil.java @@ -119,7 +119,7 @@ public final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - _log.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); + LOGGER.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); return null; } final int skillId = getSkillIdByNpcId(npc.getId()); @@ -144,7 +144,7 @@ public final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - _log.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); + LOGGER.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); return null; } final int skillId = getSkillIdByNpcId(npc.getId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java index 982e238b78..521a394dd1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/HandysBlockCheckerEvent.java @@ -95,11 +95,11 @@ public class HandysBlockCheckerEvent extends AbstractNpcAI if (Config.ENABLE_BLOCK_CHECKER_EVENT) { new HandysBlockCheckerEvent(); - _log.info("Handy's Block Checker Event is enabled"); + LOGGER.info("Handy's Block Checker Event is enabled"); } else { - _log.info("Handy's Block Checker Event is disabled"); + LOGGER.info("Handy's Block Checker Event is disabled"); } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 23514e5981..e86278e0e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -135,7 +135,7 @@ public final class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000L; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000L, cycle); - _log.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index d7ad8faf9a..d634d3338f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -302,7 +302,7 @@ public final class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - _log.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } @@ -362,7 +362,7 @@ public final class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - _log.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/GraciaLoader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/GraciaLoader.java index 0431139a71..a40b176d22 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/GraciaLoader.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/GraciaLoader.java @@ -54,7 +54,7 @@ import ai.areas.Gracia.vehicles.SoIController.SoIController; */ public final class GraciaLoader { - private static final Logger _log = Logger.getLogger(GraciaLoader.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GraciaLoader.class.getName()); private static final Class[] SCRIPTS = { @@ -95,7 +95,7 @@ public final class GraciaLoader public static void main(String[] args) { - _log.info(GraciaLoader.class.getSimpleName() + ": Loading Gracia related scripts."); + LOGGER.info(GraciaLoader.class.getSimpleName() + ": Loading Gracia related scripts."); for (Class script : SCRIPTS) { try @@ -104,7 +104,7 @@ public final class GraciaLoader } catch (Exception e) { - _log.log(Level.SEVERE, GraciaLoader.class.getSimpleName() + ": Failed loading " + script.getSimpleName() + ":", e); + LOGGER.log(Level.SEVERE, GraciaLoader.class.getSimpleName() + ": Failed loading " + script.getSimpleName() + ":", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java index 5567905365..6f05da80bc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java @@ -339,7 +339,7 @@ public class HallOfErosionAttack extends AbstractNpcAI world.setStatus(0); ((HEAWorld) world).startTime = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); - _log.info("Hall Of Erosion Attack started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Hall Of Erosion Attack started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if (player.isInParty()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java index 4612cfa6f2..e281bb1e65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java @@ -340,7 +340,7 @@ public class HallOfErosionDefence extends AbstractNpcAI world.setStatus(0); ((HEDWorld) world).startTime = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); - _log.info("Hall Of Erosion Defence started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Hall Of Erosion Defence started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if (player.isInParty()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java index 6eb6fca422..f71bbbf8cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java @@ -277,7 +277,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI world.setStatus(0); ((HSAWorld) world).storeTime[0] = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); - _log.info("Hall Of Suffering Attack started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Hall Of Suffering Attack started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); runTumors((HSAWorld) world); if (player.getParty() == null) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java index 0286fb7abc..becdfd5f9b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java @@ -277,7 +277,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI world.setStatus(0); ((HSDWorld) world).storeTime[0] = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); - _log.info("Hall Of Suffering Defence started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Hall Of Suffering Defence started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); runTumors((HSDWorld) world); if (player.getParty() == null) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index 954f59596f..5ec3467f58 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -324,7 +324,7 @@ public class HeartInfinityAttack extends AbstractNpcAI world.setTemplateId(INSTANCEID); world.setStatus(0); InstanceManager.getInstance().addWorld(world); - _log.info("Heart Infinity Attack started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Heart Infinity Attack started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if ((player.getParty() == null) || (player.getParty().getCommandChannel() == null)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java index 8c53593342..17dfa73d8f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java @@ -337,7 +337,7 @@ public class HeartInfinityDefence extends AbstractNpcAI world.setTemplateId(INSTANCEID); world.setStatus(0); InstanceManager.getInstance().addWorld(world); - _log.info("Heart Infinity Defence started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Heart Infinity Defence started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if (player.isGM()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java index c1eaaf4f2f..7628e06a11 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java @@ -839,7 +839,7 @@ public class SeedOfDestruction extends AbstractNpcAI { if (DEBUG || player.isGM()) { - _log.info("SoD is now in test mode - DEBUG OR GM PLAYER"); + LOGGER.info("SoD is now in test mode - DEBUG OR GM PLAYER"); return true; } if (player.getParty() == null) @@ -941,7 +941,7 @@ public class SeedOfDestruction extends AbstractNpcAI door.setIsAttackableDoor(true); } } - _log.info("Seed of Destruction started " + template + " Instance: " + instanceId + " created by player: " + player.getName()); + LOGGER.info("Seed of Destruction started " + template + " Instance: " + instanceId + " created by player: " + player.getName()); ((SODWorld) world).ZoneWaitForTP = true; teleto.instanceId = instanceId; @@ -1610,7 +1610,7 @@ public class SeedOfDestruction extends AbstractNpcAI } else if (npc.getId() == SPAWN_DEVICE) { - _log.info("portal kill"); + LOGGER.info("portal kill"); final Skill skilla = SkillData.getInstance().getSkill(5699, 7); skilla.applyEffects(world._tiat, world._tiat); final Skill skillb = SkillData.getInstance().getSkill(5700, 7); @@ -1674,7 +1674,7 @@ public class SeedOfDestruction extends AbstractNpcAI { if (DEBUG) { - _log.info("FirstTalkEvent: NPC " + npc.getId() + "."); + LOGGER.info("FirstTalkEvent: NPC " + npc.getId() + "."); } if (npc.getId() == TELEPORT) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java index c8739ed658..87e7481878 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java @@ -74,7 +74,7 @@ public abstract class AirShipController extends AbstractNpcAI } } - public static final Logger _log = Logger.getLogger(AirShipController.class.getName()); + public static final Logger LOGGER = Logger.getLogger(AirShipController.class.getName()); protected int _dockZone = 0; protected int _shipSpawnX = 0; protected int _shipSpawnY = 0; @@ -350,7 +350,7 @@ public abstract class AirShipController extends AbstractNpcAI final L2ScriptZone zone = ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class); if (zone == null) { - _log.log(Level.WARNING, getName() + ": Invalid zone " + _dockZone + ", controller disabled"); + LOGGER.log(Level.WARNING, getName() + ": Invalid zone " + _dockZone + ", controller disabled"); _isBusy = true; return; } @@ -360,7 +360,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (_arrivalPath.length == 0) { - _log.log(Level.WARNING, getName() + ": Zero arrival path length."); + LOGGER.log(Level.WARNING, getName() + ": Zero arrival path length."); _arrivalPath = null; } else @@ -368,7 +368,7 @@ public abstract class AirShipController extends AbstractNpcAI p = _arrivalPath[_arrivalPath.length - 1]; if (!zone.isInsideZone(p.getLocation())) { - _log.log(Level.WARNING, getName() + ": Arrival path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") not in zone " + _dockZone); + LOGGER.log(Level.WARNING, getName() + ": Arrival path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") not in zone " + _dockZone); _arrivalPath = null; } } @@ -377,7 +377,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (!ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class).isInsideZone(_shipSpawnX, _shipSpawnY, _shipSpawnZ)) { - _log.log(Level.WARNING, getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled"); + LOGGER.log(Level.WARNING, getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled"); _isBusy = true; return; } @@ -387,7 +387,7 @@ public abstract class AirShipController extends AbstractNpcAI { if (_departPath.length == 0) { - _log.log(Level.WARNING, getName() + ": Zero depart path length."); + LOGGER.log(Level.WARNING, getName() + ": Zero depart path length."); _departPath = null; } else @@ -395,7 +395,7 @@ public abstract class AirShipController extends AbstractNpcAI p = _departPath[_departPath.length - 1]; if (zone.isInsideZone(p.getLocation())) { - _log.log(Level.WARNING, getName() + ": Departure path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") in zone " + _dockZone); + LOGGER.log(Level.WARNING, getName() + ": Departure path finish point (" + p.getX() + "," + p.getY() + "," + p.getZ() + ") in zone " + _dockZone); _departPath = null; } } @@ -405,13 +405,13 @@ public abstract class AirShipController extends AbstractNpcAI { if (_fuelTable == null) { - _log.log(Level.WARNING, getName() + ": Fuel consumption not defined."); + LOGGER.log(Level.WARNING, getName() + ": Fuel consumption not defined."); } else { if (_teleportsTable.length != _fuelTable.length) { - _log.log(Level.WARNING, getName() + ": Fuel consumption not match teleport list."); + LOGGER.log(Level.WARNING, getName() + ": Fuel consumption not match teleport list."); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java index 1144b2851e..d547cdc36c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java @@ -62,9 +62,9 @@ public final class HellboundEngine extends AbstractNpcAI startQuestTimer(UPDATE_EVENT, 1000, null, null); - _log.info(HellboundEngine.class.getSimpleName() + ": Level: " + getLevel()); - _log.info(HellboundEngine.class.getSimpleName() + ": Trust: " + getTrust()); - _log.info(HellboundEngine.class.getSimpleName() + ": Status: " + (isLocked() ? "locked." : "unlocked.")); + LOGGER.info(HellboundEngine.class.getSimpleName() + ": Level: " + getLevel()); + LOGGER.info(HellboundEngine.class.getSimpleName() + ": Trust: " + getTrust()); + LOGGER.info(HellboundEngine.class.getSimpleName() + ": Status: " + (isLocked() ? "locked." : "unlocked.")); } @Override @@ -144,11 +144,11 @@ public final class HellboundEngine extends AbstractNpcAI if (added > 0) { - _log.info(getClass().getSimpleName() + ": Spawned " + added + " NPCs."); + LOGGER.info(getClass().getSimpleName() + ": Spawned " + added + " NPCs."); } if (deleted > 0) { - _log.info(getClass().getSimpleName() + ": Removed " + deleted + " NPCs."); + LOGGER.info(getClass().getSimpleName() + ": Removed " + deleted + " NPCs."); } } @@ -172,7 +172,7 @@ public final class HellboundEngine extends AbstractNpcAI return; } - _log.info(HellboundEngine.class.getSimpleName() + ": Changing level from " + getLevel() + " to " + lvl + "."); + LOGGER.info(HellboundEngine.class.getSimpleName() + ": Changing level from " + getLevel() + " to " + lvl + "."); GlobalVariablesManager.getInstance().set("HBLevel", lvl); } @@ -282,14 +282,14 @@ public final class HellboundEngine extends AbstractNpcAI } catch (Exception e) { - _log.warning(getClass().getSimpleName() + " : Doors problem!" + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + " : Doors problem!" + e.getMessage()); } } if (_cachedLevel > 0) { Broadcast.toAllOnlinePlayers(ANNOUNCEMENT.replace("%lvl%", String.valueOf(newLevel))); - _log.info(HellboundEngine.class.getSimpleName() + ": New level: " + newLevel); + LOGGER.info(HellboundEngine.class.getSimpleName() + ": New level: " + newLevel); } _cachedLevel = newLevel; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundLoader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundLoader.java index 91a25813a3..acfb9ce79a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundLoader.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundLoader.java @@ -67,7 +67,7 @@ import quests.Q00133_ThatsBloodyHot.Q00133_ThatsBloodyHot; */ public final class HellboundLoader { - private static final Logger _log = Logger.getLogger(HellboundLoader.class.getName()); + private static final Logger LOGGER = Logger.getLogger(HellboundLoader.class.getName()); private static final Class[] SCRIPTS = { @@ -117,7 +117,7 @@ public final class HellboundLoader public static void main(String[] args) { - _log.info(HellboundLoader.class.getSimpleName() + ": Loading Hellbound related scripts:"); + LOGGER.info(HellboundLoader.class.getSimpleName() + ": Loading Hellbound related scripts:"); // Data HellboundPointData.getInstance(); HellboundSpawns.getInstance(); @@ -139,7 +139,7 @@ public final class HellboundLoader } catch (Exception e) { - _log.severe(HellboundLoader.class.getSimpleName() + ": Failed loading " + script.getSimpleName() + ":" + e.getMessage()); + LOGGER.severe(HellboundLoader.class.getSimpleName() + ": Failed loading " + script.getSimpleName() + ":" + e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 36ed8103b6..e08fedc6b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -626,7 +626,7 @@ public final class Antharas extends AbstractNpcAI { if (!zone.isCharacterInZone(attacker) || (getStatus() != IN_FIGHT)) { - _log.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); attacker.teleToLocation(80464, 152294, -3534); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index 9aa5d1dbec..bdf63f29d8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -314,7 +314,7 @@ public final class Sailren extends AbstractNpcAI { if (STATUS == Status.IN_FIGHT) { - _log.info(getClass().getSimpleName() + ": Script is being unloaded while Sailren is active, clearing zone."); + LOGGER.info(getClass().getSimpleName() + ": Script is being unloaded while Sailren is active, clearing zone."); notifyEvent("TIME_OUT", null, null); } return super.unload(removeFromList); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java index 14d6a5b2ca..3b96d9fe8b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java @@ -257,7 +257,7 @@ public final class AltarsOfSacrifice extends AbstractNpcAI @Override public boolean unload(boolean removeFromList) { - _log.info(getClass().getSimpleName() + ": Unloading altars due to script unloading."); + LOGGER.info(getClass().getSimpleName() + ": Unloading altars due to script unloading."); for (Altar altar : _altars) { @@ -281,7 +281,7 @@ public final class AltarsOfSacrifice extends AbstractNpcAI } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed to spawn altar boss.", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed to spawn altar boss.", e); // let's try again to spawn it in 5 seconds startQuestTimer(event, 5000, null, null); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java index 9dafe98ff4..19908be712 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java @@ -228,7 +228,7 @@ public class AvantGarde extends AbstractNpcAI } else { - _log.warning("Invalid Sub-Class Skill Id: " + skillIdVar + " for player " + player.getName() + "!"); + LOGGER.warning("Invalid Sub-Class Skill Id: " + skillIdVar + " for player " + player.getName() + "!"); } } else if (!qvar.isEmpty() && !qvar.equals("0")) @@ -246,19 +246,19 @@ public class AvantGarde extends AbstractNpcAI itemInstance = player.getWarehouse().getItemByObjectId(itemObjId); if (itemInstance != null) { - _log.warning("Somehow " + player.getName() + " put a certification book into warehouse!"); + LOGGER.warning("Somehow " + player.getName() + " put a certification book into warehouse!"); player.getWarehouse().destroyItem("CancelCertification", itemInstance, 1, player, false); } else { - _log.warning("Somehow " + player.getName() + " deleted a certification book!"); + LOGGER.warning("Somehow " + player.getName() + " deleted a certification book!"); } } player.getVariables().set(qvarName, "0"); } else { - _log.warning("Invalid item object Id: " + qvar + " for player " + player.getName() + "!"); + LOGGER.warning("Invalid item object Id: " + qvar + " for player " + player.getName() + "!"); } } } @@ -275,7 +275,7 @@ public class AvantGarde extends AbstractNpcAI final L2ItemInstance item = player.getInventory().getItemByItemId(itemId); if (item != null) { - _log.warning(getClass().getName() + ": player " + player + " had 'extra' certification skill books while cancelling sub-class certifications!"); + LOGGER.warning(getClass().getName() + ": player " + player + " had 'extra' certification skill books while cancelling sub-class certifications!"); player.destroyItem("CancelCertificationExtraBooks", item, npc, false); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 7c8048448b..2a14fea977 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1442,7 +1442,7 @@ public final class CastleChamberlain extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index 6aea459e66..dac807cb78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public final class ManorManager extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java index a4a4276b92..9ea0214a68 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java @@ -149,7 +149,7 @@ public final class MercenaryCaptain extends AbstractNpcAI } default: { - _log.warning(MercenaryCaptain.class.getSimpleName() + ": Unknown strider type: " + type); + LOGGER.warning(MercenaryCaptain.class.getSimpleName() + ": Unknown strider type: " + type); return null; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.java index 4f5cc3d9a4..64a8a2b0f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.java @@ -75,7 +75,7 @@ public final class Selina extends AbstractNpcAI } else { - _log.warning(Selina.class.getSimpleName() + " AI: player " + player + " sent invalid bypass: " + event); + LOGGER.warning(Selina.class.getSimpleName() + " AI: player " + player + " sent invalid bypass: " + event); } return "31556-02.html"; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java index 3cbbdf5a54..2f74bfd509 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java @@ -84,7 +84,7 @@ public final class FortressOfResistance extends ClanHallSiegeEngine } catch (Exception e) { - _log.warning(getName() + ": Couldnt set the Bloody Lord Nurka spawn"); + LOGGER.warning(getName() + ": Couldnt set the Bloody Lord Nurka spawn"); e.printStackTrace(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index d0e41479da..c5b4805a6f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -291,7 +291,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine } else { - _log.warning("CHSiegeManager: No Date setted for RainBow Springs Chateau Clan hall siege!. SIEGE CANCELED!"); + LOGGER.warning("CHSiegeManager: No Date setted for RainBow Springs Chateau Clan hall siege!. SIEGE CANCELED!"); } } } @@ -691,7 +691,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine { if ((arena < 0) || (arena > 3)) { - _log.warning("RainbowSptringChateau siege: Wrong arena id passed: " + arena); + LOGGER.warning("RainbowSptringChateau siege: Wrong arena id passed: " + arena); return; } for (L2PcInstance pc : leader.getParty().getMembers()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java index 57878e253d..97061e4a0e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java @@ -249,7 +249,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } catch (Exception e) { - _log.warning(getName() + "->select_clan_npc->Wrong mahum warrior id: " + var[1]); + LOGGER.warning(getName() + "->select_clan_npc->Wrong mahum warrior id: " + var[1]); } if ((id > 0) && ((html = getAllyHtml(id)) != null)) { @@ -259,7 +259,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } else { - _log.warning(getName() + " Siege: Not enough parameters to save clan npc for clan: " + clan.getName()); + LOGGER.warning(getName() + " Siege: Not enough parameters to save clan npc for clan: " + clan.getName()); } } } @@ -544,7 +544,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine catch (Exception e) { endSiege(); - _log.warning(getName() + ": Problems in siege initialization!"); + LOGGER.warning(getName() + ": Problems in siege initialization!"); e.printStackTrace(); } } @@ -651,7 +651,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } catch (Exception e) { - _log.warning(getName() + ": Couldnt make clan spawns: " + e.getMessage()); + LOGGER.warning(getName() + ": Couldnt make clan spawns: " + e.getMessage()); e.printStackTrace(); } } @@ -773,7 +773,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine if (ClanTable.getInstance().getClan(clanId) == null) { - _log.warning(getName() + ": Loaded an unexistent clan as attacker! Clan ID: " + clanId); + LOGGER.warning(getName() + ": Loaded an unexistent clan as attacker! Clan ID: " + clanId); continue; } @@ -789,7 +789,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } catch (Exception e) { - _log.warning(getName() + ".loadAttackers()->" + e.getMessage()); + LOGGER.warning(getName() + ".loadAttackers()->" + e.getMessage()); e.printStackTrace(); } } @@ -802,7 +802,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine if (listInstance == null) { - _log.warning(getName() + ": Tried to load unregistered clan with ID " + clanId); + LOGGER.warning(getName() + ": Tried to load unregistered clan with ID " + clanId); return; } @@ -819,7 +819,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } catch (Exception e) { - _log.warning(getName() + ".loadAttackerMembers()->" + e.getMessage()); + LOGGER.warning(getName() + ".loadAttackerMembers()->" + e.getMessage()); e.printStackTrace(); } } @@ -838,7 +838,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } catch (Exception e) { - _log.warning(getName() + ".saveClan()->" + e.getMessage()); + LOGGER.warning(getName() + ".saveClan()->" + e.getMessage()); e.printStackTrace(); } } @@ -855,7 +855,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } catch (Exception e) { - _log.warning(getName() + ".saveNpc()->" + e.getMessage()); + LOGGER.warning(getName() + ".saveNpc()->" + e.getMessage()); e.printStackTrace(); } } @@ -873,7 +873,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } catch (Exception e) { - _log.warning(getName() + ".saveMember()->" + e.getMessage()); + LOGGER.warning(getName() + ".saveMember()->" + e.getMessage()); e.printStackTrace(); } } @@ -894,7 +894,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } catch (Exception e) { - _log.warning(getName() + ".clearTables()->" + e.getMessage()); + LOGGER.warning(getName() + ".clearTables()->" + e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java index e24f31d198..7ff45b055e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java @@ -60,7 +60,7 @@ public class NpcBuffer extends AbstractNpcAI private static void print(Exception e) { - _log.warning(">>>" + e + "<<<"); + LOGGER.warning(">>>" + e + "<<<"); if (DEBUG) { e.printStackTrace(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 371f41c4d1..856a47f845 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -88,7 +88,7 @@ public final class Elpies extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started because custom NPC table is disabled!"); + LOGGER.info(getName() + ": Event can't be started because custom NPC table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index adc9ed55c4..047e5389b6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -96,7 +96,7 @@ public final class Rabbits extends Event // Check starting conditions if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPCs are disabled!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java index bb07dddbf8..20e3274e89 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java @@ -121,7 +121,7 @@ public final class Race extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom npc table is disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom npc table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/EffectMasterHandler.java index a356fe0bed..68019659a3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -30,7 +30,7 @@ import handlers.effecthandlers.*; */ public final class EffectMasterHandler { - private static final Logger _log = Logger.getLogger(EffectMasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EffectMasterHandler.class.getName()); private static final Class[] EFFECTS = { @@ -211,11 +211,11 @@ public final class EffectMasterHandler // And lets try get size try { - _log.log(Level.INFO, EffectMasterHandler.class.getSimpleName() + ": Loaded " + EffectHandler.getInstance().size() + " effect handlers."); + LOGGER.log(Level.INFO, EffectMasterHandler.class.getSimpleName() + ": Loaded " + EffectHandler.getInstance().size() + " effect handlers."); } catch (Exception e) { - _log.log(Level.WARNING, "Failed invoking size method for handler: " + EffectMasterHandler.class.getSimpleName(), e); + LOGGER.log(Level.WARNING, "Failed invoking size method for handler: " + EffectMasterHandler.class.getSimpleName(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java index bc583b9647..1640a69781 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java @@ -305,7 +305,7 @@ import handlers.voicedcommandhandlers.Wedding; */ public class MasterHandler { - private static final Logger _log = Logger.getLogger(MasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MasterHandler.class.getName()); private static final IHandler[] LOAD_INSTANCES = { @@ -600,7 +600,7 @@ public class MasterHandler public static void main(String[] args) { - _log.log(Level.INFO, "Loading Handlers..."); + LOGGER.log(Level.INFO, "Loading Handlers..."); final Map, Method> registerHandlerMethods = new HashMap<>(); for (IHandler loadInstance : LOAD_INSTANCES) @@ -617,7 +617,7 @@ public class MasterHandler registerHandlerMethods.entrySet().stream().filter(e -> e.getValue() == null).forEach(e -> { - _log.log(Level.WARNING, "Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); + LOGGER.log(Level.WARNING, "Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); }); for (Class classes[] : HANDLERS) @@ -642,7 +642,7 @@ public class MasterHandler } catch (Exception e) { - _log.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); + LOGGER.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); continue; } } @@ -679,9 +679,9 @@ public class MasterHandler for (IHandler loadInstance : LOAD_INSTANCES) { - _log.log(Level.INFO, loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); + LOGGER.log(Level.INFO, loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); } - _log.log(Level.INFO, "Handlers Loaded..."); + LOGGER.log(Level.INFO, "Handlers Loaded..."); } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java index fa65f860e2..6765e4f2c7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java @@ -34,7 +34,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target; if (staticObject.getType() < 0) { - _log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); + LOGGER.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); } // Check if the L2PcInstance already target the L2NpcInstance diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 3bdc985632..70ca2fae13 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminAdmin implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminAdmin.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminAdmin.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -113,7 +113,7 @@ public class AdminAdmin implements IAdminCommandHandler } catch (Exception e) { - _log.warning("An error occured while ending olympiad: " + e); + LOGGER.warning("An error occured while ending olympiad: " + e); } activeChar.sendMessage("Heroes formed."); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 36f52d3802..0f6a32b1a1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminEditChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEditChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEditChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -217,7 +217,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set karma error: " + e); + LOGGER.warning("Set karma error: " + e); } activeChar.sendMessage("Usage: //setkarma "); } @@ -248,7 +248,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pk error: " + e); + LOGGER.warning("Set pk error: " + e); } activeChar.sendMessage("Usage: //setpk "); } @@ -279,7 +279,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pvp error: " + e); + LOGGER.warning("Set pvp error: " + e); } activeChar.sendMessage("Usage: //setpvp "); } @@ -310,7 +310,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set Fame error: " + e); + LOGGER.warning("Set Fame error: " + e); } activeChar.sendMessage("Usage: //setfame "); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 20dbed7966..1bf4c60858 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; */ public class AdminEnchant implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEnchant.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEnchant.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -147,7 +147,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a new enchant value."); } @@ -155,7 +155,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a valid new enchant value."); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java index 26f5e80c94..23e5a62258 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class AdminFortSiege implements IAdminCommandHandler { - // private static Logger _log = Logger.getLogger(AdminFortSiege.class.getName()); + // private static Logger LOGGER = Logger.getLogger(AdminFortSiege.class.getName()); private static final String[] ADMIN_COMMANDS = { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java index 10cc1afa14..4131e79a42 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminGm implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminGm.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminGm.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_gm" @@ -42,7 +42,7 @@ public class AdminGm implements IAdminCommandHandler AdminData.getInstance().deleteGm(activeChar); activeChar.setAccessLevel(0); activeChar.sendMessage("You no longer have GM status."); - _log.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") turned his GM status off"); + LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") turned his GM status off"); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index e57182036e..9f27ced089 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminHeal implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_heal" @@ -56,7 +56,7 @@ public class AdminHeal implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Heal error: " + e); + LOGGER.warning("Heal error: " + e); } activeChar.sendMessage("Incorrect target/radius specified."); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index c1c8e6c45f..dcd6d3f154 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminMenu implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminMenu.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminMenu.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -112,7 +112,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_recall_clan_menu")) @@ -141,7 +141,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_goto_char_menu")) @@ -192,7 +192,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -209,7 +209,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java index 8c1d650804..0e9726832f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class AdminMonsterRace implements IAdminCommandHandler { - // private static Logger _log = Logger.getLogger(AdminMonsterRace.class.getName()); + // private static Logger LOGGER = Logger.getLogger(AdminMonsterRace.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -133,7 +133,7 @@ public class AdminMonsterRace implements IAdminCommandHandler // MonsterRace.getInstance().newSpeeds(); // int[][] speeds2 = MonsterRace.getInstance().getSpeeds(); /* - * int[] speed = new int[8]; for (int i=0; i<8; i++) { for (int j=0; j<20; j++) { //_log.info("Adding "+speeds1[i][j] +" and "+ speeds2[i][j]); speed[i] += (speeds1[i][j]*1);// + (speeds2[i][j]*1); } _log.info("Total speed for "+(i+1)+" = "+speed[i]); } + * int[] speed = new int[8]; for (int i=0; i<8; i++) { for (int j=0; j<20; j++) { //_log.info("Adding "+speeds1[i][j] +" and "+ speeds2[i][j]); speed[i] += (speeds1[i][j]*1);// + (speeds2[i][j]*1); } LOGGER.info("Total speed for "+(i+1)+" = "+speed[i]); } */ final MonRaceInfo spk = new MonRaceInfo(codes[2][0], codes[2][1], MonsterRace.getInstance().getMonsters(), MonsterRace.getInstance().getSpeeds()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 295d5fbf86..24359ca701 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminPunishment implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPunishment.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPunishment.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -86,7 +86,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.log(Level.WARNING, getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); } } else @@ -149,7 +149,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.log(Level.WARNING, getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); } break; } @@ -186,7 +186,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.log(Level.WARNING, getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java index dd816ed085..23f04e0215 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminRepairChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRepairChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRepairChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -101,7 +101,7 @@ public class AdminRepairChar implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "could not repair char:", e); + LOGGER.log(Level.WARNING, "could not repair char:", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java index 5a98202026..027982f9a3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList; */ public class AdminShop implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShop.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShop.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -79,7 +79,7 @@ public class AdminShop implements IAdminCommandHandler } catch (Exception e) { - _log.warning("admin buylist failed:" + command); + LOGGER.warning("admin buylist failed:" + command); } final L2BuyList buyList = BuyListData.getInstance().getBuyList(val); @@ -91,7 +91,7 @@ public class AdminShop implements IAdminCommandHandler } else { - _log.warning("no buylist with id:" + val); + LOGGER.warning("no buylist with id:" + val); } activeChar.sendPacket(ActionFailed.STATIC_PACKET); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 3c4c099d11..3e33265b78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.QuestList; */ public class AdminShowQuests implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShowQuests.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShowQuests.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -312,7 +312,7 @@ public class AdminShowQuests implements IAdminCommandHandler catch (Exception e) { actor.sendMessage("There was an error."); - _log.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java index f236f673bf..0eaa40a136 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java @@ -57,7 +57,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class AdminSkill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminSkill.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -460,7 +460,7 @@ public class AdminSkill implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } if (skill != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java index a31798ec5f..e57df424e8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class AdminSpawn implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSpawn.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -377,17 +377,17 @@ public class AdminSpawn implements IAdminCommandHandler default: case 0: { - _log.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); + LOGGER.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); break; } case 1: { - _log.info(""); + LOGGER.info(""); break; } case 2: { - _log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); + LOGGER.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java index df078436ba..ea2ef9cd8a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminSummon implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSummon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName()); public static final String[] ADMIN_COMMANDS = { @@ -69,7 +69,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -81,7 +81,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index 31710067de..39aa39d4a3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminTeleport implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminTeleport.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminTeleport.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -532,7 +532,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect monster spawn."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); return; } final int respawnTime = spawn.getRespawnDelay() / 1000; @@ -578,7 +578,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect raid spawn."); - _log.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); return; } RaidBossSpawnManager.getInstance().deleteSpawn(spawn, true); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java index ca30093028..adc904859b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminUnblockIp implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminUnblockIp.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminUnblockIp.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -69,7 +69,7 @@ public class AdminUnblockIp implements IAdminCommandHandler private boolean unblockIp(String ipAddress, L2PcInstance activeChar) { // LoginServerThread.getInstance().unBlockip(ipAddress); - _log.warning("IP removed by GM " + activeChar.getName()); + LOGGER.warning("IP removed by GM " + activeChar.getName()); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index 4ece7e22ba..8b68a40e7d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -62,7 +62,7 @@ import ai.AbstractNpcAI; */ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPathNode.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPathNode.class.getName()); private final Map _zones = new ConcurrentHashMap<>(); private static final String[] COMMANDS = @@ -431,7 +431,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler catch (Exception e) { activeChar.sendMessage("Failed writing the dump: " + e.getMessage()); - _log.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Augment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Augment.java index fa57d5006c..86a44ff0ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Augment.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Augment.java @@ -57,7 +57,7 @@ public class Augment implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Buy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Buy.java index 66df958047..95a50646de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Buy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Buy.java @@ -54,7 +54,7 @@ public class Buy implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index eea3f340c7..2192741b6f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -117,7 +117,7 @@ public class ClanWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 5ad523b170..bb91ed20c1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -54,7 +54,7 @@ public class EventEngine implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java index 76c6b22b47..68fdda7cdc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java @@ -322,7 +322,7 @@ public class Festival implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 6a9c74000f..12f08ebf0b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -121,7 +121,7 @@ public class ItemAuctionLink implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 684ad1c837..9ba35ea780 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -34,13 +34,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty link html!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - _log.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java index 3b4b311eae..ef58b6b661 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java @@ -59,7 +59,7 @@ public class Multisell implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 3fc8a6c1d8..a21d56ba7c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -59,7 +59,7 @@ public class NpcViewMod implements IBypassHandler if (!st.hasMoreTokens()) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -98,7 +98,7 @@ public class NpcViewMod implements IBypassHandler { if (st.countTokens() < 2) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -121,7 +121,7 @@ public class NpcViewMod implements IBypassHandler } catch (IllegalArgumentException e) { - _log.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); + LOGGER.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); return false; } break; @@ -437,7 +437,7 @@ public class NpcViewMod implements IBypassHandler String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/DropList.htm"); if (html == null) { - _log.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); + LOGGER.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); return; } html = html.replaceAll("%name%", npc.getName()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 8a33906a9e..5c25cf405c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -114,7 +114,7 @@ public class Observation implements IBypassHandler } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java index 6bd349004c..34a360b96b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java @@ -254,7 +254,7 @@ public class OlympiadManagerLink implements IBypassHandler } default: { - _log.warning("Olympiad System: Couldnt send packet for request " + val); + LOGGER.warning("Olympiad System: Couldnt send packet for request " + val); break; } } @@ -272,21 +272,21 @@ public class OlympiadManagerLink implements IBypassHandler if (!Util.isDigit(params[1])) { - _log.warning("Olympiad Buffer Warning: npcId = " + target.getId() + " has invalid buffGroup set in the bypass for the buff selected: " + params[1]); + LOGGER.warning("Olympiad Buffer Warning: npcId = " + target.getId() + " has invalid buffGroup set in the bypass for the buff selected: " + params[1]); return false; } final int index = Integer.parseInt(params[1]); if ((index < 0) || (index > BUFFS.length)) { - _log.warning("Olympiad Buffer Warning: npcId = " + target.getId() + " has invalid index sent in the bypass: " + index); + LOGGER.warning("Olympiad Buffer Warning: npcId = " + target.getId() + " has invalid index sent in the bypass: " + index); return false; } final NpcBufferData npcBuffGroupInfo = NpcBufferTable.getInstance().getSkillInfo(target.getId(), BUFFS[index]); if (npcBuffGroupInfo == null) { - _log.warning("Olympiad Buffer Warning: npcId = " + target.getId() + " Location: " + target.getX() + ", " + target.getY() + ", " + target.getZ() + " Player: " + activeChar.getName() + " has tried to use skill group (" + params[1] + ") not assigned to the NPC Buffer!"); + LOGGER.warning("Olympiad Buffer Warning: npcId = " + target.getId() + " Location: " + target.getX() + ", " + target.getY() + ", " + target.getZ() + " Player: " + activeChar.getName() + " has tried to use skill group (" + params[1] + ") not assigned to the NPC Buffer!"); return false; } @@ -382,7 +382,7 @@ public class OlympiadManagerLink implements IBypassHandler } default: { - _log.warning("Olympiad System: Couldnt send packet for request " + val); + LOGGER.warning("Olympiad System: Couldnt send packet for request " + val); break; } } @@ -390,7 +390,7 @@ public class OlympiadManagerLink implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java index a35973c78d..ef389eeda4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java @@ -101,7 +101,7 @@ public class OlympiadObservation implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java index d8c05ac240..f4fc36a58e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java @@ -66,7 +66,7 @@ public class PlayerHelp implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index 4b826aa187..f8506f2fab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -101,7 +101,7 @@ public class PrivateWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 4a080ef615..04fc2096bb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -230,7 +230,7 @@ public class QuestLink implements IBypassHandler final L2NpcTemplate template = NpcData.getInstance().getTemplate(npcId); if (template == null) { - _log.log(Level.WARNING, QuestLink.class.getSimpleName() + ": " + player.getName() + " requested quests for talk on non existing npc " + npcId); + LOGGER.log(Level.WARNING, QuestLink.class.getSimpleName() + ": " + player.getName() + " requested quests for talk on non existing npc " + npcId); return states; } @@ -268,7 +268,7 @@ public class QuestLink implements IBypassHandler final Quest quest = state.getQuest(); if (quest == null) { - _log.log(Level.WARNING, player + " Requested incorrect quest state for non existing quest: " + state.getQuestName()); + LOGGER.log(Level.WARNING, player + " Requested incorrect quest state for non existing quest: " + state.getQuestName()); continue; } if ((quest.getId() > 0) && (quest.getId() < 20000)) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java index 1f392e63bc..eb146e83eb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java @@ -73,7 +73,7 @@ public class RentPet implements IBypassHandler } catch (Exception e) { - _log.info("Exception in " + getClass().getSimpleName()); + LOGGER.info("Exception in " + getClass().getSimpleName()); } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Rift.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Rift.java index f5ad627ff5..642a6aebaf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Rift.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Rift.java @@ -51,7 +51,7 @@ public class Rift implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index b61e60ffe4..373fbea720 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -119,7 +119,7 @@ public class SkillList implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index b932039875..a5a530e31e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -63,7 +63,7 @@ public class Wear implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } @@ -73,7 +73,7 @@ public class Wear implements IBypassHandler final L2BuyList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index edb82a730f..cbb0d9ef31 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -41,7 +41,7 @@ public final class AttackTrait extends AbstractEffect if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": this effect must have parameters!"); + LOGGER.warning(getClass().getSimpleName() + ": this effect must have parameters!"); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ce117a351b..d2c26fe372 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -41,7 +41,7 @@ public final class DefenceTrait extends AbstractEffect if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); return; } @@ -59,11 +59,11 @@ public final class DefenceTrait extends AbstractEffect } catch (NumberFormatException e) { - _log.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); + LOGGER.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getValue()); + LOGGER.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getValue()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java index fbe1912864..e93472cc22 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java @@ -62,7 +62,7 @@ public final class EnemyCharge extends AbstractEffect final double distance = Math.sqrt((dx * dx) + (dy * dy)); if (distance > 2000) { - _log.info("EffectEnemyCharge was going to use invalid coordinates for characters, getEffector: " + curX + "," + curY + " and getEffected: " + info.getEffected().getX() + "," + info.getEffected().getY()); + LOGGER.info("EffectEnemyCharge was going to use invalid coordinates for characters, getEffector: " + curX + "," + curY + " and getEffected: " + info.getEffected().getX() + "," + info.getEffected().getY()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index 5e9966ae85..091eaa31f6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -41,7 +41,7 @@ public final class GiveRecommendation extends AbstractEffect _amount = params.getInt("amount", 0); if (_amount == 0) { - _log.warning(getClass().getSimpleName() + ": amount parameter is missing or set to 0. id:" + set.getInt("id", -1)); + LOGGER.warning(getClass().getSimpleName() + ": amount parameter is missing or set to 0. id:" + set.getInt("id", -1)); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 8c0d07a23d..7d5879cc18 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -59,7 +59,7 @@ public final class MaxCp extends AbstractEffect if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 5bb578e88f..26d5cf52d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -59,7 +59,7 @@ public final class MaxHp extends AbstractEffect if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index c6b69d0e87..cd0600496d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -57,7 +57,7 @@ public final class Restoration extends AbstractEffect if ((_itemId <= 0) || (_itemCount <= 0)) { info.getEffected().sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE); - _log.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); + LOGGER.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index cba35d25b7..b95a7a2a28 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -66,7 +66,7 @@ public final class RestorationRandom extends AbstractEffect if (exSkill.getProductItems().isEmpty()) { - _log.warning("Extractable Skill with no data, probably wrong/empty table in Skill Id: " + info.getSkill().getId()); + LOGGER.warning("Extractable Skill with no data, probably wrong/empty table in Skill Id: " + info.getSkill().getId()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b02cece8bf..43528c073e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -86,7 +86,7 @@ public final class Summon extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxPetLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxPetLevel() - 1)); - _log.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxPetLevel() + ". Please rectify."); + LOGGER.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxPetLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 139bffd63e..3edc7355af 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -36,7 +36,7 @@ public final class SummonAgathion extends AbstractEffect if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); } _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 86763bab36..6fbba9bcba 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -72,7 +72,7 @@ public final class SummonCubic extends AbstractEffect if (_cubicId < 0) { - _log.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + info.getSkill().getId()); + LOGGER.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + info.getSkill().getId()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 7570a97fd8..a9aca5f86c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -77,7 +77,7 @@ public final class SummonNpc extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + info.getSkill().getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + info.getSkill().getId()); return; } @@ -90,7 +90,7 @@ public final class SummonNpc extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + info.getSkill().getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + info.getSkill().getId()); return; } @@ -147,7 +147,7 @@ public final class SummonNpc extends AbstractEffect } catch (Exception e) { - _log.warning(SummonNpc.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": " + e.getMessage()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 53230ad620..63208694f2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -76,14 +76,14 @@ public final class SummonPet extends AbstractEffect final PetItemHolder holder = player.removeScript(PetItemHolder.class); if (holder == null) { - _log.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); + LOGGER.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); return; } final L2ItemInstance item = holder.getItem(); if (player.getInventory().getItemByObjectId(item.getObjectId()) != item) { - _log.log(Level.WARNING, "Player: " + player + " is trying to summon pet from item that he doesn't owns."); + LOGGER.log(Level.WARNING, "Player: " + player + " is trying to summon pet from item that he doesn't owns."); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index bec36bfc58..e5b31b097f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -58,7 +58,7 @@ public final class SummonTrap extends AbstractEffect if (_npcId <= 0) { - _log.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + info.getSkill().getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + info.getSkill().getId()); return; } @@ -77,7 +77,7 @@ public final class SummonTrap extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + info.getSkill().getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + info.getSkill().getId()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java index a286c194db..02a2aa8d3a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java @@ -64,7 +64,7 @@ public final class ThrowUp extends AbstractEffect final double distance = Math.sqrt((dx * dx) + (dy * dy)); if (distance > 2000) { - _log.info("EffectThrow was going to use invalid coordinates for characters, getEffected: " + curX + "," + curY + " and getEffector: " + info.getEffector().getX() + "," + info.getEffector().getY()); + LOGGER.info("EffectThrow was going to use invalid coordinates for characters, getEffected: " + curX + "," + curY + " and getEffector: " + info.getEffector().getX() + "," + info.getEffector().getY()); return; } int offset = Math.min((int) distance + info.getSkill().getFlyRadius(), 1400); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index e82b4bae11..162cba6bc5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -98,7 +98,7 @@ public final class TriggerSkillByAttack extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 10370014a6..ea6c06352c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -68,7 +68,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index a72aeb40e8..6472a9dcb7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -75,7 +75,7 @@ public final class TriggerSkillByDamage extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index d7905bf48c..6bd61755b0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -75,7 +75,7 @@ public final class TriggerSkillBySkill extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 570785ef0d..9d48017dcb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -63,7 +63,7 @@ public class BeastSoulShot implements IItemHandler if (skills == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 6e6b8b36bf..3e9b43ebc8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -63,7 +63,7 @@ public class BeastSpiritShot implements IItemHandler if (skills == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 078b447706..ecc8936d87 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -50,7 +50,7 @@ public class BlessedSpiritShot implements IItemHandler if (skills == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index f0c97d55d6..ab04726b45 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -58,7 +58,7 @@ public class EventItem implements IItemHandler } default: { - _log.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); + LOGGER.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); } } return used; @@ -102,7 +102,7 @@ public class EventItem implements IItemHandler }); return true; } - _log.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); + LOGGER.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); return false; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index dd8bfe31f3..5b2b69a661 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -49,7 +49,7 @@ public class ExtractableItems implements IItemHandler final List exitem = etcitem.getExtractableItems(); if (exitem == null) { - _log.info("No extractable data defined for " + etcitem); + LOGGER.info("No extractable data defined for " + etcitem); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 650708b795..894c85271b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -65,7 +65,7 @@ public class FishShots implements IItemHandler if (skills == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index f369080547..0e9b9f4ec3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public final class Harvester implements IItemHandler final SkillHolder[] skills = item.getItem().getSkills(); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index d2a5d94ba6..dd8fa6bccb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -63,7 +63,7 @@ public class ItemSkillsTemplate implements IItemHandler final SkillHolder[] skills = item.getEtcItem().getSkills(); if (skills == null) { - _log.info("Item " + item + " does not have registered any skill for handler."); + LOGGER.info("Item " + item + " does not have registered any skill for handler."); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 7eebbddb3a..a473431752 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -70,7 +70,7 @@ public class MercTicket implements IItemHandler // Checking Seven Signs Quest Period if (SevenSigns.getInstance().getCurrentPeriod() != SevenSigns.PERIOD_SEAL_VALIDATION) { - // _log.warning("Someone has tried to spawn a guardian during Quest Event Period of The Seven Signs."); + // LOGGER.warning("Someone has tried to spawn a guardian during Quest Event Period of The Seven Signs."); activeChar.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE); return false; } @@ -81,7 +81,7 @@ public class MercTicket implements IItemHandler { if (SevenSigns.getInstance().checkIsDawnPostingTicket(itemId)) { - // _log.warning("Someone has tried to spawn a Dawn Mercenary though the Seal of Strife is not controlled by anyone."); + // LOGGER.warning("Someone has tried to spawn a Dawn Mercenary though the Seal of Strife is not controlled by anyone."); activeChar.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE); return false; } @@ -91,7 +91,7 @@ public class MercTicket implements IItemHandler { if (!SevenSigns.getInstance().checkIsRookiePostingTicket(itemId)) { - // _log.warning("Someone has tried to spawn a non-Rookie Mercenary though the Seal of Strife is controlled by Revolutionaries of Dusk."); + // LOGGER.warning("Someone has tried to spawn a non-Rookie Mercenary though the Seal of Strife is controlled by Revolutionaries of Dusk."); activeChar.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index a707c3ecb0..dfc3cdb840 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -51,7 +51,7 @@ public class SoulShots implements IItemHandler if (skills == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 51b4cf3467..03dc3321a1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -50,7 +50,7 @@ public class SpiritShot implements IItemHandler if (skills == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java index 7be88d0382..5f6ed7b07e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ClanWarsList implements IUserCommandHandler { - private static final Logger _log = Logger.getLogger(ClanWarsList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanWarsList.class.getName()); private static final int[] COMMAND_IDS = { 88, @@ -119,7 +119,7 @@ public class ClanWarsList implements IUserCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java index 008ec60163..65a2fbe2af 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java @@ -86,7 +86,7 @@ public class ChangePassword implements IVoicedCommandHandler catch (Exception e) { activeChar.sendMessage("A problem occured while changing password!"); - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java index 113fc2a0cb..c80e07ae38 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java @@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class Wedding implements IVoicedCommandHandler { - static final Logger _log = Logger.getLogger(Wedding.class.getName()); + static final Logger LOGGER = Logger.getLogger(Wedding.class.getName()); private static final String[] _voicedCommands = { "divorce", @@ -228,7 +228,7 @@ public class Wedding implements IVoicedCommandHandler } catch (Exception e) { - _log.warning("could not read friend data:" + e); + LOGGER.warning("could not read friend data:" + e); } if (!FoundOnFriendList) @@ -257,7 +257,7 @@ public class Wedding implements IVoicedCommandHandler if (activeChar.getPartnerId() == 0) { activeChar.sendMessage("Couldn't find your fiance in the Database - Inform a Gamemaster."); - _log.severe("Married but couldn't find parter for " + activeChar.getName()); + LOGGER.severe("Married but couldn't find parter for " + activeChar.getName()); return false; } @@ -515,7 +515,7 @@ public class Wedding implements IVoicedCommandHandler } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java index 0c09224dc8..381144af78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java @@ -42,7 +42,7 @@ import ai.AbstractNpcAI; */ public abstract class AbstractInstance extends AbstractNpcAI { - public final Logger _log = Logger.getLogger(getClass().getSimpleName()); + public final Logger LOGGER = Logger.getLogger(getClass().getSimpleName()); public AbstractInstance() { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index 7c522d3112..1a78904d82 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -132,7 +132,7 @@ public abstract class Chamber extends AbstractInstance } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + " ChangeRoomTask exception : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + " ChangeRoomTask exception : " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 7fba4370b1..1bbb56b1d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -1707,7 +1707,7 @@ public final class CrystalCaverns extends AbstractInstance } default: { - _log.warning("CrystalCavern-SteamCorridor: status " + world.getStatus() + " error. OracleOrder not found in " + world.getInstanceId()); + LOGGER.warning("CrystalCavern-SteamCorridor: status " + world.getStatus() + " error. OracleOrder not found in " + world.getInstanceId()); return ""; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index 9fa4e4c66e..64a49300de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -26,6 +26,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -77,6 +78,8 @@ import instances.AbstractInstance; */ public final class FinalEmperialTomb extends AbstractInstance implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(FinalEmperialTomb.class.getName()); + protected class FETWorld extends InstanceWorld { protected Lock lock = new ReentrantLock(); @@ -253,8 +256,8 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm _spawnList.clear(); _spawnZoneList.clear(); parseDatapackFile("data/scripts/instances/FinalEmperialTomb/final_emperial_tomb.xml"); - _log.info("[Final Emperial Tomb] Loaded " + _spawnZoneList.size() + " spawn zones data."); - _log.info("[Final Emperial Tomb] Loaded " + _spawnCount + " spawns data."); + LOGGER.info("[Final Emperial Tomb] Loaded " + _spawnZoneList.size() + " spawn zones data."); + LOGGER.info("[Final Emperial Tomb] Loaded " + _spawnCount + " spawns data."); } @Override @@ -275,7 +278,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm Node att = attrs.getNamedItem("npcId"); if (att == null) { - _log.severe("[Final Emperial Tomb] Missing npcId in npc List, skipping"); + LOGGER.severe("[Final Emperial Tomb] Missing npcId in npc List, skipping"); continue; } final int npcId = Integer.parseInt(attrs.getNamedItem("npcId").getNodeValue()); @@ -283,7 +286,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm att = attrs.getNamedItem("flag"); if (att == null) { - _log.severe("[Final Emperial Tomb] Missing flag in npc List npcId: " + npcId + ", skipping"); + LOGGER.severe("[Final Emperial Tomb] Missing flag in npc List npcId: " + npcId + ", skipping"); continue; } @@ -397,21 +400,21 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm Node att = attrs.getNamedItem("id"); if (att == null) { - _log.severe("[Final Emperial Tomb] Missing id in spawnZones List, skipping"); + LOGGER.severe("[Final Emperial Tomb] Missing id in spawnZones List, skipping"); continue; } final int id = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("minZ"); if (att == null) { - _log.severe("[Final Emperial Tomb] Missing minZ in spawnZones List id: " + id + ", skipping"); + LOGGER.severe("[Final Emperial Tomb] Missing minZ in spawnZones List id: " + id + ", skipping"); continue; } final int minz = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("maxZ"); if (att == null) { - _log.severe("[Final Emperial Tomb] Missing maxZ in spawnZones List id: " + id + ", skipping"); + LOGGER.severe("[Final Emperial Tomb] Missing maxZ in spawnZones List id: " + id + ", skipping"); continue; } final int maxz = Integer.parseInt(att.getNodeValue()); @@ -574,7 +577,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm } else { - _log.info("[Final Emperial Tomb] Missing zone: " + spw.zone); + LOGGER.info("[Final Emperial Tomb] Missing zone: " + spw.zone); } } } @@ -599,7 +602,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm { if (debug) { - _log.info("[Final Emperial Tomb] Starting " + world.getStatus() + ". status."); + LOGGER.info("[Final Emperial Tomb] Starting " + world.getStatus() + ". status."); } world.npcList.clear(); switch (world.getStatus()) @@ -745,7 +748,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm { if (debug) { - _log.info("[Final Emperial Tomb] Instance is deleted or all Portraits is killed."); + LOGGER.info("[Final Emperial Tomb] Instance is deleted or all Portraits is killed."); } return; } @@ -1462,7 +1465,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm ThreadPool.schedule(new StatusTask(world, 0), 2000); if (debug) { - _log.info("[Final Emperial Tomb] Hall alarm is disabled, doors will open!"); + LOGGER.info("[Final Emperial Tomb] Hall alarm is disabled, doors will open!"); } } else if (npc.getId() == DARK_CHOIR_PLAYER) @@ -1473,7 +1476,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm ThreadPool.schedule(new StatusTask(world, 2), 2000); if (debug) { - _log.info("[Final Emperial Tomb] All Dark Choir Players are killed, doors will open!"); + LOGGER.info("[Final Emperial Tomb] All Dark Choir Players are killed, doors will open!"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/InstanceLoader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/InstanceLoader.java index b39fef0e51..be9e841bd0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/InstanceLoader.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/InstanceLoader.java @@ -55,7 +55,7 @@ import instances.SanctumOftheLordsOfDawn.SanctumOftheLordsOfDawn; */ public final class InstanceLoader { - private static final Logger _log = Logger.getLogger(InstanceLoader.class.getName()); + private static final Logger LOGGER = Logger.getLogger(InstanceLoader.class.getName()); private static final Class[] SCRIPTS = { @@ -92,7 +92,7 @@ public final class InstanceLoader public static void main(String[] args) { - _log.info(InstanceLoader.class.getSimpleName() + ": Loading Instances scripts."); + LOGGER.info(InstanceLoader.class.getSimpleName() + ": Loading Instances scripts."); for (Class script : SCRIPTS) { try @@ -101,7 +101,7 @@ public final class InstanceLoader } catch (Exception e) { - _log.log(Level.SEVERE, InstanceLoader.class.getSimpleName() + ": Failed loading " + script.getSimpleName() + ":", e); + LOGGER.log(Level.SEVERE, InstanceLoader.class.getSimpleName() + ": Failed loading " + script.getSimpleName() + ":", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 8c5401230d..5418628047 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -742,7 +742,7 @@ public final class Kamaloka extends AbstractInstance } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } return null; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java index 898366e04c..32b2e8b6e9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java @@ -283,7 +283,7 @@ public final class NornilsGarden extends AbstractInstance world.setInstanceId(instanceId); world.setTemplateId(TEMPLATE_ID); InstanceManager.getInstance().addWorld(world); - _log.info("Nornils Garden: started, Instance: " + instanceId + " created by player: " + player.getName()); + LOGGER.info("Nornils Garden: started, Instance: " + instanceId + " created by player: " + player.getName()); prepareInstance((NornilsWorld) world); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 6cb4891196..531f90380a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -209,7 +209,7 @@ public class Q00350_EnhanceYourWeapon extends Quest } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } return null; } @@ -516,7 +516,7 @@ public class Q00350_EnhanceYourWeapon extends Quest final File file = new File(Config.DATAPACK_ROOT, "data/LevelUpCrystalData.xml"); if (!file.exists()) { - _log.severe("[EnhanceYourWeapon] Missing LevelUpCrystalData.xml. The quest wont work without it!"); + LOGGER.severe("[EnhanceYourWeapon] Missing LevelUpCrystalData.xml. The quest wont work without it!"); return; } @@ -536,7 +536,7 @@ public class Q00350_EnhanceYourWeapon extends Quest Node att = attrs.getNamedItem("itemId"); if (att == null) { - _log.severe("[EnhanceYourWeapon] Missing itemId in Crystal List, skipping"); + LOGGER.severe("[EnhanceYourWeapon] Missing itemId in Crystal List, skipping"); continue; } final int itemId = Integer.parseInt(attrs.getNamedItem("itemId").getNodeValue()); @@ -544,7 +544,7 @@ public class Q00350_EnhanceYourWeapon extends Quest att = attrs.getNamedItem("level"); if (att == null) { - _log.severe("[EnhanceYourWeapon] Missing level in Crystal List itemId: " + itemId + ", skipping"); + LOGGER.severe("[EnhanceYourWeapon] Missing level in Crystal List itemId: " + itemId + ", skipping"); continue; } final int level = Integer.parseInt(attrs.getNamedItem("level").getNodeValue()); @@ -552,7 +552,7 @@ public class Q00350_EnhanceYourWeapon extends Quest att = attrs.getNamedItem("leveledItemId"); if (att == null) { - _log.severe("[EnhanceYourWeapon] Missing leveledItemId in Crystal List itemId: " + itemId + ", skipping"); + LOGGER.severe("[EnhanceYourWeapon] Missing leveledItemId in Crystal List itemId: " + itemId + ", skipping"); continue; } final int leveledItemId = Integer.parseInt(attrs.getNamedItem("leveledItemId").getNodeValue()); @@ -571,7 +571,7 @@ public class Q00350_EnhanceYourWeapon extends Quest Node att = attrs.getNamedItem("npcId"); if (att == null) { - _log.severe("[EnhanceYourWeapon] Missing npcId in NPC List, skipping"); + LOGGER.severe("[EnhanceYourWeapon] Missing npcId in NPC List, skipping"); continue; } @@ -609,7 +609,7 @@ public class Q00350_EnhanceYourWeapon extends Quest final Node att2 = attrs.getNamedItem("levelList"); if ((att1 == null) && (att2 == null)) { - _log.severe("[EnhanceYourWeapon] Missing maxlevel/levelList in NPC List npcId: " + npcId + ", skipping"); + LOGGER.severe("[EnhanceYourWeapon] Missing maxlevel/levelList in NPC List npcId: " + npcId + ", skipping"); continue; } final LevelingInfo info = new LevelingInfo(absorbType, isSkillNeeded, chance); @@ -630,7 +630,7 @@ public class Q00350_EnhanceYourWeapon extends Quest Integer value = Integer.decode(st.nextToken().trim()); if (value == null) { - _log.severe("[EnhanceYourWeapon] Bad Level value!! npcId: " + npcId + " token: " + i); + LOGGER.severe("[EnhanceYourWeapon] Bad Level value!! npcId: " + npcId + " token: " + i); value = 0; } temp.put(value, info); @@ -641,7 +641,7 @@ public class Q00350_EnhanceYourWeapon extends Quest if (temp.isEmpty()) { - _log.severe("[EnhanceYourWeapon] No leveling info for npcId: " + npcId + ", skipping"); + LOGGER.severe("[EnhanceYourWeapon] No leveling info for npcId: " + npcId + ", skipping"); continue; } NPC_LEVELING_INFO.put(npcId, temp); @@ -653,9 +653,9 @@ public class Q00350_EnhanceYourWeapon extends Quest } catch (Exception e) { - _log.log(Level.WARNING, "[EnhanceYourWeapon] Could not parse LevelUpCrystalData.xml file: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "[EnhanceYourWeapon] Could not parse LevelUpCrystalData.xml file: " + e.getMessage(), e); } - _log.info("[EnhanceYourWeapon] Loaded " + SOUL_CRYSTALS.size() + " Soul Crystal data."); - _log.info("[EnhanceYourWeapon] Loaded " + NPC_LEVELING_INFO.size() + " npc Leveling info data."); + LOGGER.info("[EnhanceYourWeapon] Loaded " + SOUL_CRYSTALS.size() + " Soul Crystal data."); + LOGGER.info("[EnhanceYourWeapon] Loaded " + NPC_LEVELING_INFO.size() + " npc Leveling info data."); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 22ce71d720..1f307adffd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -110,7 +110,7 @@ public final class Q00511_AwlUnderFoot extends Quest } catch (Exception e) { - _log.warning("Fortress AwlUnderFoot Raid Spawn error: " + e); + LOGGER.warning("Fortress AwlUnderFoot Raid Spawn error: " + e); } } } @@ -295,7 +295,7 @@ public final class Q00511_AwlUnderFoot extends Quest world.setStatus(0); dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME); InstanceManager.getInstance().addWorld(world); - _log.info("Fortress AwlUnderFoot started " + template + " Instance: " + instanceId + " created by player: " + player.getName()); + LOGGER.info("Fortress AwlUnderFoot started " + template + " Instance: " + instanceId + " created by player: " + player.getName()); ThreadPool.schedule(new spawnRaid((FAUWorld) world), RAID_SPAWN_DELAY); // teleport players diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java index 09688b99cf..39c8512f08 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java @@ -636,7 +636,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest ThreadPool.schedule(new spawnNpcs((CAUWorld) world), INITIAL_SPAWN_DELAY); if (DEBUG) { - _log.info("Castle HopeWithinTheDarkness started " + template + " Instance: " + instanceId + " created by player: " + player.getName()); + LOGGER.info("Castle HopeWithinTheDarkness started " + template + " Instance: " + instanceId + " created by player: " + player.getName()); } // Teleport players @@ -699,7 +699,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest } catch (Exception e) { - _log.warning("Castle HopeWithinTheDarkness NPC Spawn error: " + e); + LOGGER.warning("Castle HopeWithinTheDarkness NPC Spawn error: " + e); } } } @@ -740,7 +740,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest } catch (Exception e) { - _log.warning("Castle HopeWithinTheDarkness Monster Spawn error: " + e); + LOGGER.warning("Castle HopeWithinTheDarkness Monster Spawn error: " + e); } } } @@ -806,7 +806,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest } catch (Exception e) { - _log.warning("Complete dungeon manage error: " + e); + LOGGER.warning("Complete dungeon manage error: " + e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/QuestMasterHandler.java index 3499688f06..499aa08ab1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/QuestMasterHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/QuestMasterHandler.java @@ -531,7 +531,7 @@ import quests.Q10505_JewelOfValakas.Q10505_JewelOfValakas; */ public class QuestMasterHandler { - private static final Logger _log = Logger.getLogger(QuestMasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(QuestMasterHandler.class.getName()); private static final Class[] QUESTS = { @@ -1053,7 +1053,7 @@ public class QuestMasterHandler } catch (Exception e) { - _log.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); + LOGGER.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java index 5feafb35b4..e0af4197c8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java @@ -96,7 +96,7 @@ public class TerritoryWarSuperClass extends Quest GlobalVariablesManager.getInstance().set(TerritoryWarManager.GLOBAL_VARIABLE, cal.getTimeInMillis()); } TerritoryWarManager.getInstance().setTWStartTimeInMillis(cal.getTimeInMillis()); - _log.info(getClass().getSimpleName() + ": Siege date: " + cal.getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege date: " + cal.getTime()); } } @@ -271,7 +271,7 @@ public class TerritoryWarSuperClass extends Quest } else { - _log.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId()); + LOGGER.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId()); } } } @@ -399,7 +399,7 @@ public class TerritoryWarSuperClass extends Quest } else { - _log.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId()); + LOGGER.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java index 8a49c493c1..6bf29a52b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatGiranTalking implements Runnable { - private static final Logger _log = Logger.getLogger(BoatGiranTalking.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatGiranTalking.class.getName()); // Time: 868s private static final VehiclePathPoint[] GIRAN_TO_TALKING = @@ -304,7 +304,7 @@ public class BoatGiranTalking implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage()); + LOGGER.log(Level.WARNING, e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java index b1eaafd9d1..4e4a622229 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatGludinRune implements Runnable { - private static final Logger _log = Logger.getLogger(BoatGludinRune.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatGludinRune.class.getName()); // Time: 1151s private static final VehiclePathPoint[] GLUDIN_TO_RUNE = @@ -340,7 +340,7 @@ public class BoatGludinRune implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage()); + LOGGER.log(Level.WARNING, e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index 32e220cf58..d2675f78b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatInnadrilTour implements Runnable { - private static final Logger _log = Logger.getLogger(BoatInnadrilTour.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatInnadrilTour.class.getName()); // Time: 1867s private static final VehiclePathPoint[] TOUR = @@ -187,7 +187,7 @@ public class BoatInnadrilTour implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage()); + LOGGER.log(Level.WARNING, e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index 601427d03e..c36900ac9f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatRunePrimeval implements Runnable { - private static final Logger _log = Logger.getLogger(BoatRunePrimeval.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatRunePrimeval.class.getName()); // Time: 239s private static final VehiclePathPoint[] RUNE_TO_PRIMEVAL = @@ -167,7 +167,7 @@ public class BoatRunePrimeval implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage()); + LOGGER.log(Level.WARNING, e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java index 3881804617..5e7f064c40 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; */ public class BoatTalkingGludin implements Runnable { - private static final Logger _log = Logger.getLogger(BoatTalkingGludin.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BoatTalkingGludin.class.getName()); // Time: 919s private static final VehiclePathPoint[] TALKING_TO_GLUDIN = @@ -297,7 +297,7 @@ public class BoatTalkingGludin implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage()); + LOGGER.log(Level.WARNING, e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseRecievePacket.java index 9aad5fd2ec..9299ada3fb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseRecievePacket.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public abstract class BaseRecievePacket { - private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseRecievePacket.class.getName()); private final byte[] _decrypt; private int _off; @@ -78,7 +78,7 @@ public abstract class BaseRecievePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } return result; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseSendablePacket.java index 3c8cab50e4..e7f3cf5107 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseSendablePacket.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; */ public abstract class BaseSendablePacket { - private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseSendablePacket.class.getName()); private final ByteArrayOutputStream _bao; @@ -78,7 +78,7 @@ public abstract class BaseSendablePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } _bao.write(0); @@ -93,7 +93,7 @@ public abstract class BaseSendablePacket } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java index 05703c4528..02081a7db0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; public class ScrambledKeyPair { - private static Logger _log = Logger.getLogger(ScrambledKeyPair.class.getName()); + private static Logger LOGGER = Logger.getLogger(ScrambledKeyPair.class.getName()); public KeyPair _pair; public byte[] _scrambledModulus; @@ -66,7 +66,7 @@ public class ScrambledKeyPair { scrambledMod[0x40 + i] = (byte) (scrambledMod[0x40 + i] ^ scrambledMod[i]); } - _log.finer("Modulus was scrambled"); + LOGGER.finer("Modulus was scrambled"); return scrambledMod; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java index 0ca6190ab3..f1fd5a42a3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class SevenSigns { - protected static final Logger _log = Logger.getLogger(SevenSigns.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SevenSigns.class.getName()); // Basic Seven Signs Constants \\ public static final String SEVEN_SIGNS_HTML_PATH = "data/html/seven_signs/"; @@ -148,36 +148,36 @@ public class SevenSigns } catch (Exception e) { - _log.log(Level.SEVERE, "SevenSigns: Failed to load configuration: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "SevenSigns: Failed to load configuration: " + e.getMessage(), e); } - _log.info("SevenSigns: Currently in the " + getCurrentPeriodName() + " period!"); + LOGGER.info("SevenSigns: Currently in the " + getCurrentPeriodName() + " period!"); initializeSeals(); if (isSealValidationPeriod()) { if (getCabalHighestScore() == CABAL_NULL) { - _log.info("SevenSigns: The competition ended with a tie last week."); + LOGGER.info("SevenSigns: The competition ended with a tie last week."); } else { - _log.info("SevenSigns: The " + getCabalName(getCabalHighestScore()) + " were victorious last week."); + LOGGER.info("SevenSigns: The " + getCabalName(getCabalHighestScore()) + " were victorious last week."); } } else if (getCabalHighestScore() == CABAL_NULL) { - _log.info("SevenSigns: The competition, if the current trend continues, will end in a tie this week."); + LOGGER.info("SevenSigns: The competition, if the current trend continues, will end in a tie this week."); } else { - _log.info("SevenSigns: The " + getCabalName(getCabalHighestScore()) + " are in the lead this week."); + LOGGER.info("SevenSigns: The " + getCabalName(getCabalHighestScore()) + " are in the lead this week."); } long milliToChange = 0; if (isNextPeriodChangeInPast()) { - _log.info("SevenSigns: Next period change was in the past (server was offline), changing periods now!"); + LOGGER.info("SevenSigns: Next period change was in the past (server was offline), changing periods now!"); } else { @@ -197,7 +197,7 @@ public class SevenSigns final int numHours = (int) Math.floor(countDown % 24); final int numDays = (int) Math.floor((countDown - numHours) / 24); - _log.info("SevenSigns: Next period begins in " + numDays + " days, " + numHours + " hours and " + numMins + " mins."); + LOGGER.info("SevenSigns: Next period begins in " + numDays + " days, " + numHours + " hours and " + numMins + " mins."); } @@ -549,7 +549,7 @@ public class SevenSigns break; } } - _log.info("SevenSigns: Next period change set to " + _nextPeriodChange.getTime()); + LOGGER.info("SevenSigns: Next period change set to " + _nextPeriodChange.getTime()); } public final String getCurrentPeriodName() @@ -906,7 +906,7 @@ public class SevenSigns } catch (SQLException e) { - _log.log(Level.SEVERE, "SevenSigns: Unable to load Seven Signs data from database: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "SevenSigns: Unable to load Seven Signs data from database: " + e.getMessage(), e); } // Festival data is loaded now after the Seven Signs engine data. } @@ -936,7 +936,7 @@ public class SevenSigns } catch (SQLException e) { - _log.log(Level.SEVERE, "SevenSigns: Unable to save data to database: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "SevenSigns: Unable to save data to database: " + e.getMessage(), e); } } @@ -963,7 +963,7 @@ public class SevenSigns } catch (SQLException e) { - _log.log(Level.SEVERE, "SevenSigns: Unable to save data to database: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "SevenSigns: Unable to save data to database: " + e.getMessage(), e); } } @@ -1000,7 +1000,7 @@ public class SevenSigns } catch (SQLException e) { - _log.log(Level.SEVERE, "SevenSigns: Unable to save data to database: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "SevenSigns: Unable to save data to database: " + e.getMessage(), e); } } @@ -1066,7 +1066,7 @@ public class SevenSigns } catch (SQLException e) { - _log.log(Level.SEVERE, "SevenSigns: Failed to save data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "SevenSigns: Failed to save data: " + e.getMessage(), e); } } @@ -1257,16 +1257,16 @@ public class SevenSigns { if (isSealValidationPeriod()) { - _log.info("SevenSigns: The " + getCabalName(e.getValue()) + " have won the " + getSealName(e.getKey(), false) + "."); + LOGGER.info("SevenSigns: The " + getCabalName(e.getValue()) + " have won the " + getSealName(e.getKey(), false) + "."); } else { - _log.info("SevenSigns: The " + getSealName(e.getKey(), false) + " is currently owned by " + getCabalName(e.getValue()) + "."); + LOGGER.info("SevenSigns: The " + getSealName(e.getKey(), false) + " is currently owned by " + getCabalName(e.getValue()) + "."); } } else { - _log.info("SevenSigns: The " + getSealName(e.getKey(), false) + " remains unclaimed."); + LOGGER.info("SevenSigns: The " + getSealName(e.getKey(), false) + " remains unclaimed."); } } } @@ -1584,7 +1584,7 @@ public class SevenSigns giveCPMult(getSealOwner(SEAL_STRIFE)); // Send message that Seal Validation has begun. sendMessageToAll(SystemMessageId.SEVEN_SIGNS_THE_SEAL_VALIDATION_PERIOD_HAS_BEGUN); - _log.info("SevenSigns: The " + getCabalName(_previousWinner) + " have won the competition with " + getCurrentScore(_previousWinner) + " points!"); + LOGGER.info("SevenSigns: The " + getCabalName(_previousWinner) + " have won the competition with " + getCurrentScore(_previousWinner) + " points!"); break; } case PERIOD_SEAL_VALIDATION: // Reset for New Cycle @@ -1621,7 +1621,7 @@ public class SevenSigns Broadcast.toAllOnlinePlayers(ss); spawnSevenSignsNPC(); - _log.info("SevenSigns: The " + getCurrentPeriodName() + " period has begun!"); + LOGGER.info("SevenSigns: The " + getCurrentPeriodName() + " period has begun!"); setCalendarForNextPeriodChange(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java index 8f218e1599..d77f8b2148 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java @@ -71,7 +71,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SevenSignsFestival implements SpawnListener { - protected static final Logger _log = Logger.getLogger(SevenSignsFestival.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SevenSignsFestival.class.getName()); private static final String GET_CLAN_NAME = "SELECT clan_name FROM clan_data WHERE clan_id = (SELECT clanid FROM characters WHERE char_name = ?)"; @@ -792,7 +792,7 @@ public class SevenSignsFestival implements SpawnListener if (SevenSigns.getInstance().isSealValidationPeriod()) { - _log.info("SevenSignsFestival: Initialization bypassed due to Seal Validation in effect."); + LOGGER.info("SevenSignsFestival: Initialization bypassed due to Seal Validation in effect."); return; } @@ -933,7 +933,7 @@ public class SevenSignsFestival implements SpawnListener setNextFestivalStart(Config.ALT_FESTIVAL_MANAGER_START + FESTIVAL_SIGNUP_TIME); _managerScheduledTask = ThreadPool.scheduleAtFixedRate(_managerInstance, Config.ALT_FESTIVAL_MANAGER_START, Config.ALT_FESTIVAL_CYCLE_LENGTH); - _log.info("SevenSignsFestival: The first Festival of Darkness cycle begins in " + (Config.ALT_FESTIVAL_MANAGER_START / 60000) + " minute(s)."); + LOGGER.info("SevenSignsFestival: The first Festival of Darkness cycle begins in " + (Config.ALT_FESTIVAL_MANAGER_START / 60000) + " minute(s)."); } /** @@ -971,7 +971,7 @@ public class SevenSignsFestival implements SpawnListener } catch (SQLException e) { - _log.log(Level.SEVERE, "SevenSignsFestival: Failed to load configuration: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "SevenSignsFestival: Failed to load configuration: " + e.getMessage(), e); } final StringBuilder query = new StringBuilder(); @@ -1005,7 +1005,7 @@ public class SevenSignsFestival implements SpawnListener } catch (SQLException e) { - _log.log(Level.SEVERE, "SevenSignsFestival: Failed to load configuration: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "SevenSignsFestival: Failed to load configuration: " + e.getMessage(), e); } } @@ -1035,7 +1035,7 @@ public class SevenSignsFestival implements SpawnListener } catch (SQLException e) { - _log.log(Level.SEVERE, "SevenSignsFestival: Failed to save configuration: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "SevenSignsFestival: Failed to save configuration: " + e.getMessage(), e); } // Updates Seven Signs DB data also, so call only if really necessary. @@ -1144,7 +1144,7 @@ public class SevenSignsFestival implements SpawnListener } catch (Exception e) { - _log.log(Level.WARNING, "Could not get clan name of " + partyMemberName + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not get clan name of " + partyMemberName + ": " + e.getMessage(), e); } } } @@ -1220,7 +1220,7 @@ public class SevenSignsFestival implements SpawnListener } } - _log.info("SevenSignsFestival: Reinitialized engine for next competition period."); + LOGGER.info("SevenSignsFestival: Reinitialized engine for next competition period."); } public final int getCurrentFestivalCycle() @@ -2004,7 +2004,7 @@ public class SevenSignsFestival implements SpawnListener } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } @@ -2153,7 +2153,7 @@ public class SevenSignsFestival implements SpawnListener } catch (Exception e) { - _log.log(Level.WARNING, "SevenSignsFestival: Error while spawning Festival Witch ID " + _witchSpawn._npcId + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "SevenSignsFestival: Error while spawning Festival Witch ID " + _witchSpawn._npcId + ": " + e.getMessage(), e); } // Make it appear as though the Witch has apparated there. @@ -2296,7 +2296,7 @@ public class SevenSignsFestival implements SpawnListener } catch (Exception e) { - _log.log(Level.WARNING, "SevenSignsFestival: Error while spawning NPC ID " + currSpawn._npcId + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "SevenSignsFestival: Error while spawning NPC ID " + currSpawn._npcId + ": " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index cec73ae6de..2140351a32 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -951,7 +951,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable npc.setTarget(npc); npc.doCast(sk); npc.setTarget(target); - // _log.info(this.getActor().getName() + " used heal skill " + sk.getName() + " on itself"); + // LOGGER.info(this.getActor().getName() + " used heal skill " + sk.getName() + " on itself"); return; } } @@ -1067,7 +1067,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable npc.setTarget(npc); npc.doCast(sk); npc.setTarget(target); - // _log.info(this.getActor().getName() + " used heal skill " + sk.getName() + " on party"); + // LOGGER.info(this.getActor().getName() + " used heal skill " + sk.getName() + " on party"); return; } } @@ -1105,7 +1105,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { clientStopMoving(null); npc.doCast(shortRangeSkill); - // _log.info(this.getActor().getName() + " used short range skill " + shortRangeSkill.getName() + " on " + npc.getTarget().getName()); + // LOGGER.info(this.getActor().getName() + " used short range skill " + shortRangeSkill.getName() + " on " + npc.getTarget().getName()); return; } } @@ -1117,7 +1117,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { clientStopMoving(null); npc.doCast(longRangeSkill); - // _log.info(this.getActor().getName() + " used long range skill " + longRangeSkill.getName() + " on " + npc.getTarget().getName()); + // LOGGER.info(this.getActor().getName() + " used long range skill " + longRangeSkill.getName() + " on " + npc.getTarget().getName()); return; } } @@ -1715,7 +1715,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable catch (NullPointerException e) { setIntention(AI_INTENTION_ACTIVE); - // _log.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - failed executing movementDisable()!"); + // LOGGER.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - failed executing movementDisable()!"); return; } } @@ -2162,7 +2162,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } catch (Exception e) { - // _log.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - onEvtThink() failed!"); + // LOGGER.warning(getClass().getSimpleName() + ": " + this.getActor().getName() + " - onEvtThink() failed!"); } finally { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java index c9652ac83e..c58d8f364a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class ForumsBBSManager extends BaseBBSManager { - private static Logger _log = Logger.getLogger(ForumsBBSManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(ForumsBBSManager.class.getName()); private final List _table; private int _lastid = 1; @@ -51,7 +51,7 @@ public class ForumsBBSManager extends BaseBBSManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); } } @@ -61,7 +61,7 @@ public class ForumsBBSManager extends BaseBBSManager public void initRoot() { _table.forEach(f -> f.vload()); - _log.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java index 35a00703eb..d7560d8f7d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class CharNameTable { - private static Logger _log = Logger.getLogger(CharNameTable.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharNameTable.class.getName()); private final Map _chars = new ConcurrentHashMap<>(); private final Map _accessLevels = new ConcurrentHashMap<>(); @@ -114,7 +114,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); } if (id > 0) @@ -162,7 +162,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return null; // not found @@ -190,7 +190,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); } return result; } @@ -211,7 +211,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); } return 0; } @@ -231,9 +231,9 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); } public static CharNameTable getInstance() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentBase.java index 3c498510b1..639c3ddf7c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentBase.java @@ -138,7 +138,7 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public abstract class DocumentBase { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final File _file; protected final Map _tables = new HashMap<>(); @@ -161,7 +161,7 @@ public abstract class DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Error loading file " + _file, e); + LOGGER.log(Level.SEVERE, "Error loading file " + _file, e); } return doc; } @@ -311,7 +311,7 @@ public abstract class DocumentBase parseTemplate(n, effect); if (template instanceof L2Item) { - _log.severe("Item " + template + " with effects!!!"); + LOGGER.severe("Item " + template + " with effects!!!"); } else if (template instanceof Skill) { @@ -425,7 +425,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -442,7 +442,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -456,7 +456,7 @@ public abstract class DocumentBase return new ConditionLogicNot(parseCondition(n, template)); } } - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); return null; } @@ -923,7 +923,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1108,7 +1108,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1148,7 +1148,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); + LOGGER.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); } } cond = joinAnd(cond, new ConditionUsingItemType(mask)); @@ -1169,7 +1169,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); + LOGGER.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); } } cond = joinAnd(cond, new ConditionUsingSlotType(mask)); @@ -1205,7 +1205,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1235,7 +1235,7 @@ public abstract class DocumentBase } if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java index 72d1746f32..06d0d45ac2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -85,7 +85,7 @@ public final class DocumentItem extends DocumentBase } catch (Exception e) { - _log.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); + LOGGER.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/skills/DocumentSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/skills/DocumentSkill.java index 5d686e5f3f..5ee55ef204 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/skills/DocumentSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/skills/DocumentSkill.java @@ -88,7 +88,7 @@ public class DocumentSkill extends DocumentBase } catch (RuntimeException e) { - _log.log(Level.SEVERE, "Error in table: " + name + " of Skill Id " + _currentSkill.id, e); + LOGGER.log(Level.SEVERE, "Error in table: " + name + " of Skill Id " + _currentSkill.id, e); return ""; } } @@ -102,7 +102,7 @@ public class DocumentSkill extends DocumentBase } catch (RuntimeException e) { - _log.log(Level.SEVERE, "wrong level count in skill Id " + _currentSkill.id + " name: " + name + " index : " + idx, e); + LOGGER.log(Level.SEVERE, "wrong level count in skill Id " + _currentSkill.id + " name: " + name + " index : " + idx, e); return ""; } } @@ -1500,7 +1500,7 @@ public class DocumentSkill extends DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); + LOGGER.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); } } int _count = count; @@ -1514,7 +1514,7 @@ public class DocumentSkill extends DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); + LOGGER.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); } } _count = count; @@ -1528,7 +1528,7 @@ public class DocumentSkill extends DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); + LOGGER.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); } } _count = count; @@ -1542,7 +1542,7 @@ public class DocumentSkill extends DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); + LOGGER.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); } } _count = count; @@ -1556,7 +1556,7 @@ public class DocumentSkill extends DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); + LOGGER.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); } } _count = count; @@ -1570,7 +1570,7 @@ public class DocumentSkill extends DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); + LOGGER.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); } } _count = count; @@ -1584,7 +1584,7 @@ public class DocumentSkill extends DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); + LOGGER.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); } } _count = count; @@ -1598,7 +1598,7 @@ public class DocumentSkill extends DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); + LOGGER.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); } } _count = count; @@ -1612,7 +1612,7 @@ public class DocumentSkill extends DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); + LOGGER.log(Level.SEVERE, "Skill id=" + set.getInt("skill_id") + "level" + set.getInt("level"), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index b4a9846eb5..064f13410f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -50,7 +50,7 @@ import com.l2jmobius.gameserver.util.MathUtil; */ public class GeoEngine { - protected static final Logger _log = Logger.getLogger(GeoEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GeoEngine.class.getName()); private final ABlock[][] _blocks; private final BlockNull _nullBlock; @@ -69,7 +69,7 @@ public class GeoEngine */ public GeoEngine() { - _log.info("GeoEngine: Initializing..."); + LOGGER.info("GeoEngine: Initializing..."); // initialize block container _blocks = new ABlock[GeoStructure.GEO_BLOCKS_X][GeoStructure.GEO_BLOCKS_Y]; @@ -103,7 +103,7 @@ public class GeoEngine } } - _log.info("GeoEngine: Loaded " + loaded + " geodata files."); + LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files."); // avoid wrong configs when no files are loaded if (loaded == 0) @@ -111,12 +111,12 @@ public class GeoEngine if (Config.PATHFINDING) { Config.PATHFINDING = false; - _log.info("GeoEngine: Forcing PathFinding setting to false."); + LOGGER.info("GeoEngine: Forcing PathFinding setting to false."); } if (Config.COORD_SYNCHRONIZE == 2) { Config.COORD_SYNCHRONIZE = -1; - _log.info("GeoEngine: Forcing CoordSynchronize setting to -1."); + LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); } } @@ -183,7 +183,7 @@ public class GeoEngine // check data consistency if (buffer.remaining() > 0) { - _log.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); + LOGGER.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); } // loading was successful @@ -192,8 +192,8 @@ public class GeoEngine catch (Exception e) { // an error occured while loading, load null blocks - _log.warning("GeoEngine: Error while loading " + filename + " region file."); - _log.warning(e.getMessage()); + LOGGER.warning("GeoEngine: Error while loading " + filename + " region file."); + LOGGER.warning(e.getMessage()); e.printStackTrace(); // replace whole region file with null blocks @@ -298,7 +298,7 @@ public class GeoEngine if (block == null) // null block check { // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) - // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // LOGGER.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java index 5c642dd824..26337f2a4e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java @@ -56,11 +56,11 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); + LOGGER.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); } } - _log.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); + LOGGER.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); } @Override @@ -108,7 +108,7 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); return null; } finally diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IActionHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IActionHandler.java index c4addd7df5..3640b57f65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IActionHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IActionHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionHandler { - Logger _log = Logger.getLogger(IActionHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java index 35c546715c..5c5b946828 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionShiftHandler { - Logger _log = Logger.getLogger(IActionShiftHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionShiftHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IBypassHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IBypassHandler.java index a5a6295386..626cdb2b17 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IBypassHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IBypassHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public interface IBypassHandler { - Logger _log = Logger.getLogger(IBypassHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IBypassHandler.class.getName()); /** * This is the worker method that is called when someone uses an bypass command. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IItemHandler.java index 2f3d043ad0..a2079cc4ec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IItemHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public interface IItemHandler { - Logger _log = Logger.getLogger(IItemHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IItemHandler.class.getName()); /** * Launch task associated to the item. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java index 4030ad83de..0f9c7b0132 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentType; */ public interface IPunishmentHandler { - Logger _log = Logger.getLogger(IPunishmentHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IPunishmentHandler.class.getName()); void onStart(PunishmentTask task); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/ITelnetHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/ITelnetHandler.java index 5e4b3e3d5e..f8a0f4ecbf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/ITelnetHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/ITelnetHandler.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; */ public interface ITelnetHandler { - Logger _log = Logger.getLogger(ITelnetHandler.class.getName()); + Logger LOGGER = Logger.getLogger(ITelnetHandler.class.getName()); /** * this is the worker method that is called when someone uses an bypass command diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java index 72b8a7b21a..d1cb086c89 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IUserCommandHandler { - Logger _log = Logger.getLogger(IUserCommandHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IUserCommandHandler.class.getName()); /** * this is the worker method that is called when someone uses an admin command. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IVoicedCommandHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IVoicedCommandHandler.java index f7c6438246..c695adbaae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IVoicedCommandHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/IVoicedCommandHandler.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IVoicedCommandHandler { - Logger _log = Logger.getLogger(IVoicedCommandHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IVoicedCommandHandler.class.getName()); /** * this is the worker method that is called when someone uses an admin command. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/AirShipManager.java index aa3a9b64f2..27e559e0ec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExAirShipTeleportList; public class AirShipManager { - private static final Logger _log = Logger.getLogger(AirShipManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AirShipManager.class.getName()); private static final String LOAD_DB = "SELECT * FROM airships"; private static final String ADD_DB = "INSERT INTO airships (owner_id,fuel) VALUES (?,?)"; @@ -172,11 +172,11 @@ public class AirShipManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not add new airship license: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not add new airship license: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing: " + e.getMessage(), e); } } @@ -247,13 +247,13 @@ public class AirShipManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load airships table: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load airships table: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _airShipsInfo.size() + " private airships"); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _airShipsInfo.size() + " private airships"); } private void storeInDb(int ownerId) @@ -273,11 +273,11 @@ public class AirShipManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not update airships table: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not update airships table: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while save: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while save: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CHSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CHSiegeManager.java index 53e23c2d59..1209bbbddd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CHSiegeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CHSiegeManager.java @@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class CHSiegeManager { - private static final Logger _log = Logger.getLogger(CHSiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CHSiegeManager.class.getName()); private static final String SQL_LOAD_HALLS = "SELECT * FROM siegable_clanhall"; private final Map _siegableHalls = new HashMap<>(); @@ -76,11 +76,11 @@ public final class CHSiegeManager _siegableHalls.put(id, hall); ClanHallManager.addClanHall(hall); } - _log.info(getClass().getSimpleName() + ": Loaded " + _siegableHalls.size() + " conquerable clan halls."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _siegableHalls.size() + " conquerable clan halls."); } catch (Exception e) { - _log.warning("CHSiegeManager: Could not load siegable clan halls!:" + e.getMessage()); + LOGGER.warning("CHSiegeManager: Could not load siegable clan halls!:" + e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java index 6d7b4add29..19f4a89df7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; public final class CastleManager implements InstanceListManager { - private static final Logger _log = Logger.getLogger(CastleManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName()); private final List _castles = new ArrayList<>(); @@ -291,7 +291,7 @@ public final class CastleManager implements InstanceListManager } catch (Exception e) { - _log.log(Level.WARNING, "Failed to remove castle circlets offline for player " + member.getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Failed to remove castle circlets offline for player " + member.getName() + ": " + e.getMessage(), e); } } } @@ -307,11 +307,11 @@ public final class CastleManager implements InstanceListManager { _castles.add(new Castle(rs.getInt("id"))); } - _log.info(getClass().getSimpleName() + ": Loaded: " + _castles.size() + " castles"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _castles.size() + " castles"); } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index d9532675ab..819002610d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.entity.Auction; */ public final class ClanHallAuctionManager { - protected static final Logger _log = Logger.getLogger(ClanHallAuctionManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ClanHallAuctionManager.class.getName()); private final List _auctions = new ArrayList<>(); private static final String[] ITEM_INIT_DATA = @@ -106,11 +106,11 @@ public final class ClanHallAuctionManager { _auctions.add(new Auction(rs.getInt("id"))); } - _log.info(getClass().getSimpleName() + ": Loaded: " + _auctions.size() + " auction(s)"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _auctions.size() + " auction(s)"); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: AuctionManager.load(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: AuctionManager.load(): " + e.getMessage(), e); } } @@ -159,7 +159,7 @@ public final class ClanHallAuctionManager } if ((i >= ItemInitDataId.length) || (ItemInitDataId[i] != id)) { - _log.warning(getClass().getSimpleName() + ": Clan Hall auction not found for Id :" + id); + LOGGER.warning(getClass().getSimpleName() + ": Clan Hall auction not found for Id :" + id); return; } @@ -168,11 +168,11 @@ public final class ClanHallAuctionManager { s.executeUpdate("INSERT INTO `auction` VALUES " + ITEM_INIT_DATA[i]); _auctions.add(new Auction(id)); - _log.info(getClass().getSimpleName() + ": Created auction for ClanHall: " + id); + LOGGER.info(getClass().getSimpleName() + ": Created auction for ClanHall: " + id); } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Exception: Auction.initNPC(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Exception: Auction.initNPC(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java index d6a8b37ff2..3cb9150afb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.zone.type.L2ClanHallZone; */ public final class ClanHallManager { - protected static final Logger _log = Logger.getLogger(ClanHallManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ClanHallManager.class.getName()); private final Map _clanHall = new ConcurrentHashMap<>(); private final Map _freeClanHall = new ConcurrentHashMap<>(); @@ -99,13 +99,13 @@ public final class ClanHallManager ClanHallAuctionManager.getInstance().initNPC(id); } } - _log.info(getClass().getSimpleName() + ": Loaded: " + getClanHalls().size() + " clan halls"); - _log.info(getClass().getSimpleName() + ": Loaded: " + getFreeClanHalls().size() + " free clan halls"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getClanHalls().size() + " clan halls"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getFreeClanHalls().size() + " free clan halls"); _loaded = true; } catch (Exception e) { - _log.log(Level.WARNING, "Exception: ClanHallManager.load(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: ClanHallManager.load(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java index 73d6181a75..836fd6218d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.entity.Couple; */ public final class CoupleManager { - private static final Logger _log = Logger.getLogger(CoupleManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CoupleManager.class.getName()); private final List _couples = new CopyOnWriteArrayList<>(); @@ -59,11 +59,11 @@ public final class CoupleManager { getCouples().add(new Couple(rs.getInt("id"))); } - _log.info(getClass().getSimpleName() + ": Loaded: " + getCouples().size() + " couples(s)"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getCouples().size() + " couples(s)"); } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: CoupleManager.load(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: CoupleManager.load(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 5004df769f..a19dfa0453 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public final class CursedWeaponsManager { - private static final Logger _log = Logger.getLogger(CursedWeaponsManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName()); private Map _cursedWeapons; @@ -79,7 +79,7 @@ public final class CursedWeaponsManager load(); restore(); controlPlayers(); - _log.info(getClass().getSimpleName() + ": Loaded : " + _cursedWeapons.size() + " cursed weapon(s)."); + LOGGER.info(getClass().getSimpleName() + ": Loaded : " + _cursedWeapons.size() + " cursed weapon(s)."); } public final void reload() @@ -98,7 +98,7 @@ public final class CursedWeaponsManager final File file = new File(Config.DATAPACK_ROOT + "/data/CursedWeapons.xml"); if (!file.exists()) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find data/" + file.getName()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find data/" + file.getName()); return; } @@ -161,7 +161,7 @@ public final class CursedWeaponsManager } catch (Exception e) { - _log.log(Level.SEVERE, "Error parsing cursed weapons file.", e); + LOGGER.log(Level.SEVERE, "Error parsing cursed weapons file.", e); return; } @@ -188,7 +188,7 @@ public final class CursedWeaponsManager } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore CursedWeapons data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore CursedWeapons data: " + e.getMessage(), e); } } @@ -221,7 +221,7 @@ public final class CursedWeaponsManager { // A player has the cursed weapon in his inventory ... final int playerId = rset.getInt("owner_id"); - _log.info("PROBLEM : Player " + playerId + " owns the cursed weapon " + itemId + " but he shouldn't."); + LOGGER.info("PROBLEM : Player " + playerId + " owns the cursed weapon " + itemId + " but he shouldn't."); // Delete the item try (PreparedStatement delete = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?")) @@ -230,7 +230,7 @@ public final class CursedWeaponsManager delete.setInt(2, itemId); if (delete.executeUpdate() != 1) { - _log.warning("Error while deleting cursed weapon " + itemId + " from userId " + playerId); + LOGGER.warning("Error while deleting cursed weapon " + itemId + " from userId " + playerId); } } @@ -242,7 +242,7 @@ public final class CursedWeaponsManager update.setInt(3, playerId); if (update.executeUpdate() != 1) { - _log.warning("Error while updating karma & pkkills for userId " + cw.getPlayerId()); + LOGGER.warning("Error while updating karma & pkkills for userId " + cw.getPlayerId()); } } // clean up the cursed weapons table. @@ -254,7 +254,7 @@ public final class CursedWeaponsManager } catch (Exception e) { - _log.log(Level.WARNING, "Could not check CursedWeapons data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not check CursedWeapons data: " + e.getMessage(), e); } } @@ -370,7 +370,7 @@ public final class CursedWeaponsManager } catch (SQLException e) { - _log.log(Level.SEVERE, "CursedWeaponsManager: Failed to remove data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "CursedWeaponsManager: Failed to remove data: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java index d7614cd116..4019cdcb71 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance; */ public final class DayNightSpawnManager { - private static Logger _log = Logger.getLogger(DayNightSpawnManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(DayNightSpawnManager.class.getName()); private final List _dayCreatures = new ArrayList<>(); private final List _nightCreatures = new ArrayList<>(); @@ -106,7 +106,7 @@ public final class DayNightSpawnManager i++; } } - _log.info("DayNightSpawnManager: Removed " + i + " " + UnspawnLogInfo + " creatures"); + LOGGER.info("DayNightSpawnManager: Removed " + i + " " + UnspawnLogInfo + " creatures"); } int i = 0; @@ -121,11 +121,11 @@ public final class DayNightSpawnManager i++; } - _log.info("DayNightSpawnManager: Spawned " + i + " " + SpawnLogInfo + " creatures"); + LOGGER.info("DayNightSpawnManager: Spawned " + i + " " + SpawnLogInfo + " creatures"); } catch (Exception e) { - _log.log(Level.WARNING, "Error while spawning creatures: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while spawning creatures: " + e.getMessage(), e); } } @@ -152,7 +152,7 @@ public final class DayNightSpawnManager } default: { - _log.warning("DayNightSpawnManager: Wrong mode sent"); + LOGGER.warning("DayNightSpawnManager: Wrong mode sent"); break; } } @@ -173,7 +173,7 @@ public final class DayNightSpawnManager } catch (Exception e) { - _log.log(Level.WARNING, "Error while notifyChangeMode(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while notifyChangeMode(): " + e.getMessage(), e); } } @@ -214,7 +214,7 @@ public final class DayNightSpawnManager } catch (Exception e) { - _log.log(Level.WARNING, "Error while specialNoghtBoss(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while specialNoghtBoss(): " + e.getMessage(), e); } } @@ -225,7 +225,7 @@ public final class DayNightSpawnManager case 0: { boss.deleteMe(); - _log.info(getClass().getSimpleName() + ": Deleting Hellman raidboss"); + LOGGER.info(getClass().getSimpleName() + ": Deleting Hellman raidboss"); break; } case 1: @@ -234,7 +234,7 @@ public final class DayNightSpawnManager { boss.spawnMe(); } - _log.info(getClass().getSimpleName() + ": Spawning Hellman raidboss"); + LOGGER.info(getClass().getSimpleName() + ": Spawning Hellman raidboss"); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index bc5900f021..ccecc45415 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.util.Util; */ public final class DimensionalRiftManager { - private static Logger _log = Logger.getLogger(DimensionalRiftManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(DimensionalRiftManager.class.getName()); private final Map> _rooms = new HashMap<>(7); private static final int DIMENSIONAL_FRAGMENT_ITEM_ID = 7079; @@ -106,7 +106,7 @@ public final class DimensionalRiftManager } catch (Exception e) { - _log.log(Level.WARNING, "Can't load Dimension Rift zones. " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Can't load Dimension Rift zones. " + e.getMessage(), e); } final int typeSize = _rooms.keySet().size(); @@ -117,7 +117,7 @@ public final class DimensionalRiftManager roomSize += _rooms.get(b).keySet().size(); } - _log.info(getClass().getSimpleName() + ": Loaded " + typeSize + " room types with " + roomSize + " rooms."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + typeSize + " room types with " + roomSize + " rooms."); } public void loadSpawns() @@ -132,7 +132,7 @@ public final class DimensionalRiftManager final File file = new File(Config.DATAPACK_ROOT, "data/DimensionalRift.xml"); if (!file.exists()) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find data/" + file.getName()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find data/" + file.getName()); return; } @@ -170,11 +170,11 @@ public final class DimensionalRiftManager if (!_rooms.containsKey(type)) { - _log.warning("Type " + type + " not found!"); + LOGGER.warning("Type " + type + " not found!"); } else if (!_rooms.get(type).containsKey(roomId)) { - _log.warning("Room " + roomId + " in Type " + type + " not found!"); + LOGGER.warning("Room " + roomId + " in Type " + type + " not found!"); } for (int i = 0; i < count; i++) @@ -213,9 +213,9 @@ public final class DimensionalRiftManager } catch (Exception e) { - _log.log(Level.WARNING, "Error on loading dimensional rift spawns: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error on loading dimensional rift spawns: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + countGood + " dimensional rift spawns, " + countBad + " errors."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + countGood + " dimensional rift spawns, " + countBad + " errors."); } public void reload() @@ -444,7 +444,7 @@ public final class DimensionalRiftManager showHtmlFile(player, "data/html/seven_signs/rift/Cheater.htm", npc); if (!player.isGM()) { - _log.warning("Player " + player.getName() + "(" + player.getObjectId() + ") was cheating in dimension rift area!"); + LOGGER.warning("Player " + player.getName() + "(" + player.getObjectId() + ") was cheating in dimension rift area!"); Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to cheat in dimensional rift.", Config.DEFAULT_PUNISH); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java index 7f4c6abd61..f635c19883 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class FactionManager { - private static Logger _log = Logger.getLogger(FactionManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(FactionManager.class.getName()); private final Map _playerFactions = new ConcurrentHashMap<>(); protected FactionManager() @@ -57,9 +57,9 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); } public final int getFactionByCharId(int id) @@ -91,7 +91,7 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return 0; // not found diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java index 299e79ed20..823e8edcb1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FishingChampionshipManager { - protected static final Logger _log = Logger.getLogger(FishingChampionshipManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FishingChampionshipManager.class.getName()); private static final String INSERT = "INSERT INTO fishing_championship(player_name,fish_length,rewarded) VALUES (?,?,?)"; private static final String DELETE = "DELETE FROM fishing_championship"; @@ -120,7 +120,7 @@ public class FishingChampionshipManager } catch (SQLException e) { - _log.log(Level.WARNING, "FishingChampionshipManager: can't restore fishing championship info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FishingChampionshipManager: can't restore fishing championship info: " + e.getMessage(), e); } } @@ -384,7 +384,7 @@ public class FishingChampionshipManager } catch (SQLException e) { - _log.log(Level.WARNING, "FishingChampionshipManager: can't update infos: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FishingChampionshipManager: can't update infos: " + e.getMessage(), e); } } @@ -470,7 +470,7 @@ public class FishingChampionshipManager setEndOfChamp(); shutdown(); - _log.info("FishingChampionshipManager : new event period start."); + LOGGER.info("FishingChampionshipManager : new event period start."); ThreadPool.schedule(new finishChamp(), _enddate - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 41db13a24a..bb2f2cac2a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.entity.Fort; public final class FortManager implements InstanceListManager { - protected static final Logger _log = Logger.getLogger(FortManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); private final List _forts = new ArrayList<>(); @@ -169,7 +169,7 @@ public final class FortManager implements InstanceListManager _forts.add(new Fort(rs.getInt("id"))); } - _log.info(getClass().getSimpleName() + ": Loaded: " + _forts.size() + " fortress"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _forts.size() + " fortress"); for (Fort fort : _forts) { fort.getSiege().getSiegeGuardManager().loadSiegeGuard(); @@ -177,7 +177,7 @@ public final class FortManager implements InstanceListManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java index f986c28b69..6325ea375e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.entity.Fort; public final class FortSiegeGuardManager { - private static final Logger _log = Logger.getLogger(FortSiegeGuardManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FortSiegeGuardManager.class.getName()); private final Fort _fort; private final Map> _siegeGuards = new HashMap<>(); @@ -68,7 +68,7 @@ public final class FortSiegeGuardManager } catch (Exception e) { - _log.log(Level.WARNING, "Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } @@ -94,7 +94,7 @@ public final class FortSiegeGuardManager } catch (Exception e) { - _log.log(Level.WARNING, "Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } @@ -130,7 +130,7 @@ public final class FortSiegeGuardManager } catch (Exception e) { - _log.log(Level.WARNING, "Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index 8bbf318958..9d241d3c82 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class FortSiegeManager { - private static final Logger _log = Logger.getLogger(FortSiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FortSiegeManager.class.getName()); private int _attackerMaxClans = 500; // Max number of clans @@ -102,7 +102,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -123,7 +123,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); + LOGGER.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); } // Siege setting @@ -164,7 +164,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading commander(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading commander(s) for " + fort.getName() + " fort."); } } @@ -190,7 +190,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading flag(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading flag(s) for " + fort.getName() + " fort."); } } _flagList.put(fort.getResidenceId(), flagSpawns); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 6b1105741d..3fa1a269f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -62,7 +62,7 @@ import com.l2jmobius.gameserver.util.Util; */ public final class FourSepulchersManager { - private static final Logger _log = Logger.getLogger(FourSepulchersManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FourSepulchersManager.class.getName()); private static final int QUEST_ID = 620; @@ -205,25 +205,25 @@ public final class FourSepulchersManager { clean(); _changeEntryTimeTask = ThreadPool.schedule(new FourSepulchersChangeEntryTimeTask(), 0); - _log.info(getClass().getSimpleName() + ": Beginning in Entry time"); + LOGGER.info(getClass().getSimpleName() + ": Beginning in Entry time"); } else if ((currentTime >= _entryTimeEnd) && (currentTime < _warmUpTimeEnd)) // warmup time check { clean(); _changeWarmUpTimeTask = ThreadPool.schedule(new FourSepulchersChangeWarmUpTimeTask(), 0); - _log.info(getClass().getSimpleName() + ": Beginning in WarmUp time"); + LOGGER.info(getClass().getSimpleName() + ": Beginning in WarmUp time"); } else if ((currentTime >= _warmUpTimeEnd) && (currentTime < _attackTimeEnd)) // attack time check { clean(); _changeAttackTimeTask = ThreadPool.schedule(new FourSepulchersChangeAttackTimeTask(), 0); - _log.info(getClass().getSimpleName() + ": Beginning in Attack time"); + LOGGER.info(getClass().getSimpleName() + ": Beginning in Attack time"); } else // else cooldown time and without cleanup because it's already implemented { _changeCoolDownTimeTask = ThreadPool.schedule(new FourSepulchersChangeCoolDownTimeTask(), 0); - _log.info(getClass().getSimpleName() + ": Beginning in Cooldown time"); + LOGGER.info(getClass().getSimpleName() + ": Beginning in Cooldown time"); } } @@ -316,11 +316,11 @@ public final class FourSepulchersManager SpawnTable.getInstance().addNewSpawn(spawnDat, false); spawnDat.doSpawn(); spawnDat.startRespawn(); - _log.info(getClass().getSimpleName() + ": spawned " + spawnDat.getTemplate().getName()); + LOGGER.info(getClass().getSimpleName() + ": spawned " + spawnDat.getTemplate().getName()); } catch (Exception e) { - _log.log(Level.WARNING, "Error while spawning managers: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while spawning managers: " + e.getMessage(), e); } } } @@ -432,12 +432,12 @@ public final class FourSepulchersManager _mysteriousBoxSpawns.put(keyNpcId, spawnDat); } } - _log.info(getClass().getSimpleName() + ": loaded " + _mysteriousBoxSpawns.size() + " Mysterious-Box spawns."); + LOGGER.info(getClass().getSimpleName() + ": loaded " + _mysteriousBoxSpawns.size() + " Mysterious-Box spawns."); } catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "FourSepulchersManager.LoadMysteriousBox: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FourSepulchersManager.LoadMysteriousBox: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -459,7 +459,7 @@ public final class FourSepulchersManager } catch (Exception e) { - _log.log(Level.WARNING, "FourSepulchersManager.InitKeyBoxSpawns: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FourSepulchersManager.InitKeyBoxSpawns: Spawn could not be initialized: " + e.getMessage(), e); } } } @@ -503,11 +503,11 @@ public final class FourSepulchersManager _physicalMonsters.put(keyNpcId, _physicalSpawns); } } - _log.info(getClass().getSimpleName() + ": loaded " + loaded + " Physical type monsters spawns."); + LOGGER.info(getClass().getSimpleName() + ": loaded " + loaded + " Physical type monsters spawns."); } catch (Exception e) { - _log.log(Level.WARNING, "FourSepulchersManager.LoadPhysicalMonsters: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FourSepulchersManager.LoadPhysicalMonsters: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -551,11 +551,11 @@ public final class FourSepulchersManager _magicalMonsters.put(keyNpcId, _magicalSpawns); } } - _log.info(getClass().getSimpleName() + ": loaded " + loaded + " Magical type monsters spawns."); + LOGGER.info(getClass().getSimpleName() + ": loaded " + loaded + " Magical type monsters spawns."); } catch (Exception e) { - _log.log(Level.WARNING, "FourSepulchersManager.LoadMagicalMonsters: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FourSepulchersManager.LoadMagicalMonsters: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -603,11 +603,11 @@ public final class FourSepulchersManager _archonSpawned.put(keyNpcId, false); } } - _log.info(getClass().getSimpleName() + ": loaded " + loaded + " Church of duke monsters spawns."); + LOGGER.info(getClass().getSimpleName() + ": loaded " + loaded + " Church of duke monsters spawns."); } catch (Exception e) { - _log.log(Level.WARNING, "FourSepulchersManager.LoadDukeMonsters: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FourSepulchersManager.LoadDukeMonsters: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -651,11 +651,11 @@ public final class FourSepulchersManager _emperorsGraveNpcs.put(keyNpcId, _emperorsGraveSpawns); } } - _log.info(getClass().getSimpleName() + ": loaded " + loaded + " Emperor's grave NPC spawns."); + LOGGER.info(getClass().getSimpleName() + ": loaded " + loaded + " Emperor's grave NPC spawns."); } catch (Exception e) { - _log.log(Level.WARNING, "FourSepulchersManager.LoadEmperorsGraveMonsters: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FourSepulchersManager.LoadEmperorsGraveMonsters: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -687,7 +687,7 @@ public final class FourSepulchersManager } catch (Exception e) { - _log.log(Level.SEVERE, "Error on InitLocationShadowSpawns", e); + LOGGER.log(Level.SEVERE, "Error on InitLocationShadowSpawns", e); } } } @@ -710,7 +710,7 @@ public final class FourSepulchersManager } catch (Exception e) { - _log.log(Level.WARNING, "FourSepulchersManager.InitExecutionerSpawns: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FourSepulchersManager.InitExecutionerSpawns: Spawn could not be initialized: " + e.getMessage(), e); } } } @@ -845,7 +845,7 @@ public final class FourSepulchersManager final Quest hostQuest = QuestManager.getInstance().getQuest(QUEST_ID); if (hostQuest == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find quest: " + QUEST_ID); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find quest: " + QUEST_ID); return; } final int npcId = npc.getId(); @@ -864,7 +864,7 @@ public final class FourSepulchersManager { if (!player.isGM()) { - _log.warning("Player " + player.getName() + "(" + player.getObjectId() + ") tried to cheat in four sepulchers."); + LOGGER.warning("Player " + player.getName() + "(" + player.getObjectId() + ") tried to cheat in four sepulchers."); Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to enter four sepulchers with invalid npc id.", Config.DEFAULT_PUNISH); } return; @@ -1139,7 +1139,7 @@ public final class FourSepulchersManager } catch (Exception e) { - _log.log(Level.WARNING, "FourSepulchersManager.SpawnMonster: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FourSepulchersManager.SpawnMonster: Spawn could not be initialized: " + e.getMessage(), e); } spawnedKeyBoxMob = true; @@ -1375,7 +1375,7 @@ public final class FourSepulchersManager } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed deleting mob.", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Failed deleting mob.", e); } } _allMobs.clear(); @@ -1394,12 +1394,12 @@ public final class FourSepulchersManager } else { - _log.warning(getClass().getSimpleName() + ": Attempted to close undefined door. doorId: " + doorId); + LOGGER.warning(getClass().getSimpleName() + ": Attempted to close undefined door. doorId: " + doorId); } } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed closing door", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Failed closing door", e); } } } @@ -1526,12 +1526,12 @@ public final class FourSepulchersManager { if (temp == null) { - _log.warning(getClass().getSimpleName() + ": managerSay(): manager is null"); + LOGGER.warning(getClass().getSimpleName() + ": managerSay(): manager is null"); continue; } if (!(temp.getLastSpawn() instanceof L2SepulcherNpcInstance)) { - _log.warning(getClass().getSimpleName() + ": managerSay(): manager is not Sepulcher instance"); + LOGGER.warning(getClass().getSimpleName() + ": managerSay(): manager is not Sepulcher instance"); continue; } // hall not used right now, so its manager will not tell you anything :) @@ -1553,12 +1553,12 @@ public final class FourSepulchersManager { if (temp == null) { - _log.warning(getClass().getSimpleName() + ": Something goes wrong in managerSay()..."); + LOGGER.warning(getClass().getSimpleName() + ": Something goes wrong in managerSay()..."); continue; } if (!(temp.getLastSpawn() instanceof L2SepulcherNpcInstance)) { - _log.warning(getClass().getSimpleName() + ": Something goes wrong in managerSay()..."); + LOGGER.warning(getClass().getSimpleName() + ": Something goes wrong in managerSay()..."); continue; } ((L2SepulcherNpcInstance) temp.getLastSpawn()).sayInShout(msg1); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/GlobalVariablesManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/GlobalVariablesManager.java index 1734533230..63cb74f74e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/GlobalVariablesManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/GlobalVariablesManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.variables.AbstractVariables; */ public final class GlobalVariablesManager extends AbstractVariables { - private static final Logger _log = Logger.getLogger(GlobalVariablesManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GlobalVariablesManager.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM global_variables"; @@ -61,14 +61,14 @@ public final class GlobalVariablesManager extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore global variables"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore global variables"); return false; } finally { compareAndSetChanges(true, false); } - _log.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + getSet().size() + " variables."); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + getSet().size() + " variables."); return true; } @@ -99,14 +99,14 @@ public final class GlobalVariablesManager extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't save global variables to database.", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't save global variables to database.", e); return false; } finally { compareAndSetChanges(true, false); } - _log.log(Level.INFO, getClass().getSimpleName() + ": Stored " + getSet().size() + " variables."); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Stored " + getSet().size() + " variables."); return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java index b98088e91a..eda3f62de0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -56,7 +56,7 @@ public final class GrandBossManager implements IStorable private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?"; private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?"; - protected static Logger _log = Logger.getLogger(GrandBossManager.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GrandBossManager.class.getName()); protected static final Map BOSSES = new ConcurrentHashMap<>(); @@ -93,21 +93,21 @@ public final class GrandBossManager implements IStorable int status = rs.getInt("status"); _bossStatus.put(bossId, status); _storedInfo.put(bossId, info); - _log.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status + "."); + LOGGER.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status + "."); if (status > 0) { - _log.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time")) + "."); + LOGGER.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time")) + "."); } } - _log.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances"); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances"); } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, "Error while initializing GrandBossManager: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while initializing GrandBossManager: " + e.getMessage(), e); } ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000); } @@ -131,15 +131,15 @@ public final class GrandBossManager implements IStorable { zones.get(rs.getInt("zone")).add(rs.getInt("player_id")); } - _log.info(getClass().getSimpleName() + ": Initialized " + _zones.size() + " Grand Boss Zones"); + LOGGER.info(getClass().getSimpleName() + ": Initialized " + _zones.size() + " Grand Boss Zones"); } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_list table: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_list table: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, "Error while initializing GrandBoss zones: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while initializing GrandBoss zones: " + e.getMessage(), e); } for (Entry e : _zones.entrySet()) @@ -194,7 +194,7 @@ public final class GrandBossManager implements IStorable public void setBossStatus(int bossId, int status) { _bossStatus.put(bossId, status); - _log.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); + LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); updateDb(bossId, true); } @@ -294,7 +294,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store grandbosses to database:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store grandbosses to database:" + e.getMessage(), e); return false; } return true; @@ -342,7 +342,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update grandbosses to database:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update grandbosses to database:" + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java index 48a390259a..2a3e1c8d9e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance; */ public final class ItemAuctionManager { - private static final Logger _log = Logger.getLogger(ItemAuctionManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName()); private final Map _managerInstances = new HashMap<>(); private final AtomicInteger _auctionIds; @@ -54,7 +54,7 @@ public final class ItemAuctionManager if (!Config.ALT_ITEM_AUCTION_ENABLED) { - _log.log(Level.INFO, getClass().getSimpleName() + ": Disabled by config."); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Disabled by config."); return; } @@ -69,13 +69,13 @@ public final class ItemAuctionManager } catch (SQLException e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed loading auctions.", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Failed loading auctions.", e); } final File file = new File(Config.DATAPACK_ROOT, "data/ItemAuctions.xml"); if (!file.exists()) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Missing ItemAuctions.xml!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Missing ItemAuctions.xml!"); return; } @@ -107,11 +107,11 @@ public final class ItemAuctionManager } } } - _log.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + _managerInstances.size() + " instance(s)."); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + _managerInstances.size() + " instance(s)."); } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed loading auctions from xml.", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Failed loading auctions from xml.", e); } } @@ -151,7 +151,7 @@ public final class ItemAuctionManager } catch (SQLException e) { - _log.log(Level.SEVERE, "L2ItemAuctionManagerInstance: Failed deleting auction: " + auctionId, e); + LOGGER.log(Level.SEVERE, "L2ItemAuctionManagerInstance: Failed deleting auction: " + auctionId, e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 30f612af8b..7b29d65274 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public final class ItemsOnGroundManager implements Runnable { - private static final Logger _log = Logger.getLogger(ItemsOnGroundManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemsOnGroundManager.class.getName()); private final List _items = new CopyOnWriteArrayList<>(); @@ -88,7 +88,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); } } @@ -131,11 +131,11 @@ public final class ItemsOnGroundManager implements Runnable } } } - _log.info(getClass().getSimpleName() + ": Loaded " + count + " items."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + count + " items."); } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); } if (Config.EMPTY_DROPPED_ITEM_TABLE_AFTER_LOAD) @@ -180,7 +180,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e1) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); } } @@ -225,13 +225,13 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); } } } catch (SQLException e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MailManager.java index 96a58c11ec..3d83cae120 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MailManager.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExNoticePostArrived; */ public final class MailManager { - private static final Logger _log = Logger.getLogger(MailManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MailManager.class.getName()); private final Map _messages = new ConcurrentHashMap<>(); @@ -82,9 +82,9 @@ public final class MailManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error loading from database:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading from database:" + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Successfully loaded " + count + " messages."); + LOGGER.info(getClass().getSimpleName() + ": Successfully loaded " + count + " messages."); } public final Message getMessage(int msgId) @@ -172,7 +172,7 @@ public final class MailManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error saving message:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error saving message:" + e.getMessage(), e); } final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId()); @@ -194,7 +194,7 @@ public final class MailManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error marking as read message:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error marking as read message:" + e.getMessage(), e); } } @@ -208,7 +208,7 @@ public final class MailManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error marking as deleted by sender message:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error marking as deleted by sender message:" + e.getMessage(), e); } } @@ -222,7 +222,7 @@ public final class MailManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error marking as deleted by receiver message:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error marking as deleted by receiver message:" + e.getMessage(), e); } } @@ -236,7 +236,7 @@ public final class MailManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error removing attachments in message:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error removing attachments in message:" + e.getMessage(), e); } } @@ -250,7 +250,7 @@ public final class MailManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error deleting message:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error deleting message:" + e.getMessage(), e); } _messages.remove(msgId); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java index 73ad259a2e..5d6d2c8765 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public final class MercTicketManager { - private static final Logger _log = Logger.getLogger(MercTicketManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MercTicketManager.class.getName()); private static final List DROPPED_TICKETS = new CopyOnWriteArrayList<>(); @@ -200,11 +200,11 @@ public final class MercTicketManager rs.close(); s.close(); - _log.info(getClass().getSimpleName() + ": Loaded: " + DROPPED_TICKETS.size() + " Mercenary Tickets"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + DROPPED_TICKETS.size() + " Mercenary Tickets"); } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadMercenaryData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadMercenaryData(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 6e5151f338..2367c26d13 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class PetitionManager { - protected static final Logger _log = Logger.getLogger(PetitionManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PetitionManager.class.getName()); private final Map _pendingPetitions; private final Map _completedPetitions; @@ -55,7 +55,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getCompletedPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() @@ -63,7 +63,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getPendingPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } public boolean acceptPetition(L2PcInstance respondingAdmin, int petitionId) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 96d4e5a59c..88daa47c9f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentType; */ public final class PunishmentManager { - private static final Logger _log = Logger.getLogger(PunishmentManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PunishmentManager.class.getName()); private final Map _tasks = new ConcurrentHashMap<>(); @@ -83,10 +83,10 @@ public final class PunishmentManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while loading punishments: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while loading punishments: ", e); } - _log.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + initiated + " active and " + expired + " expired punishments."); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + initiated + " active and " + expired + " expired punishments."); } public void startPunishment(PunishmentTask task) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java index 544a3fc517..1b1ab2ed29 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java @@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class RaidBossPointsManager { - private static final Logger _log = Logger.getLogger(RaidBossPointsManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RaidBossPointsManager.class.getName()); private final Map> _list = new ConcurrentHashMap<>(); @@ -68,11 +68,11 @@ public class RaidBossPointsManager values.put(bossId, points); _list.put(charId, values); } - _log.info(getClass().getSimpleName() + ": Loaded " + _list.size() + " Characters Raid Points."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _list.size() + " Characters Raid Points."); } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldnt load raid points ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldnt load raid points ", e); } } @@ -88,7 +88,7 @@ public class RaidBossPointsManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update char raid points for player: " + player, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update char raid points for player: " + player, e); } } @@ -130,7 +130,7 @@ public class RaidBossPointsManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't clean raid points", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't clean raid points", e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java index 9e0a784f10..37b0b0a743 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance; */ public class RaidBossSpawnManager { - private static final Logger _log = Logger.getLogger(RaidBossSpawnManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RaidBossSpawnManager.class.getName()); protected static final Map _bosses = new ConcurrentHashMap<>(); protected static final Map _spawns = new ConcurrentHashMap<>(); @@ -92,22 +92,22 @@ public class RaidBossSpawnManager addNewSpawn(spawnDat, rs.getLong("respawn_time"), rs.getDouble("currentHP"), rs.getDouble("currentMP"), false); } - _log.info(getClass().getSimpleName() + ": Loaded " + _bosses.size() + " Instances"); - _log.info(getClass().getSimpleName() + ": Scheduled " + _schedules.size() + " Instances"); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _bosses.size() + " Instances"); + LOGGER.info(getClass().getSimpleName() + ": Scheduled " + _schedules.size() + " Instances"); } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": Couldnt load raidboss_spawnlist table"); + LOGGER.warning(getClass().getSimpleName() + ": Couldnt load raidboss_spawnlist table"); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing RaidBossSpawnManager: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing RaidBossSpawnManager: " + e.getMessage(), e); } } private static class SpawnSchedule implements Runnable { - private static final Logger _log = Logger.getLogger(SpawnSchedule.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SpawnSchedule.class.getName()); private final int bossId; @@ -145,7 +145,7 @@ public class RaidBossSpawnManager _storedInfo.put(bossId, info); - _log.info(getClass().getSimpleName() + ": Spawning Raid Boss " + raidboss.getName()); + LOGGER.info(getClass().getSimpleName() + ": Spawning Raid Boss " + raidboss.getName()); _bosses.put(bossId, raidboss); } @@ -184,7 +184,7 @@ public class RaidBossSpawnManager { final Calendar time = Calendar.getInstance(); time.setTimeInMillis(respawnTime); - _log.info(getClass().getSimpleName() + ": Updated " + boss.getName() + " respawn time to " + time.getTime()); + LOGGER.info(getClass().getSimpleName() + ": Updated " + boss.getName() + " respawn time to " + time.getTime()); _schedules.put(boss.getId(), ThreadPool.schedule(new SpawnSchedule(boss.getId()), respawnDelay)); updateDb(); @@ -266,7 +266,7 @@ public class RaidBossSpawnManager catch (Exception e) { // problem with storing spawn - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not store raidboss #" + bossId + " in the DB:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not store raidboss #" + bossId + " in the DB:" + e.getMessage(), e); } } } @@ -318,7 +318,7 @@ public class RaidBossSpawnManager catch (Exception e) { // problem with deleting spawn - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove raidboss #" + bossId + " from DB: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove raidboss #" + bossId + " from DB: " + e.getMessage(), e); } } } @@ -369,13 +369,13 @@ public class RaidBossSpawnManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldnt update raidboss_spawnlist table " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldnt update raidboss_spawnlist table " + e.getMessage(), e); } } } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": SQL error while updating RaidBoss spawn to database: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": SQL error while updating RaidBoss spawn to database: " + e.getMessage(), e); } } @@ -465,7 +465,7 @@ public class RaidBossSpawnManager _storedInfo.put(raidboss.getId(), info); - _log.info(getClass().getSimpleName() + ": Spawning Night Raid Boss " + raidboss.getName()); + LOGGER.info(getClass().getSimpleName() + ": Spawning Night Raid Boss " + raidboss.getName()); _bosses.put(raidboss.getId(), raidboss); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java index c1df0ca78b..6208afb86b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.Shutdown; */ public class ServerRestartManager { - static final Logger _log = Logger.getLogger(ServerRestartManager.class.getName()); + static final Logger LOGGER = Logger.getLogger(ServerRestartManager.class.getName()); private String nextRestartTime = "unknown"; @@ -72,12 +72,12 @@ public class ServerRestartManager { nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime()); ThreadPool.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000)); - _log.info("Scheduled server restart at " + lastRestart.getTime() + "."); + LOGGER.info("Scheduled server restart at " + lastRestart.getTime() + "."); } } catch (Exception e) { - _log.info("The scheduled server restart config is not set properly, please correct it!"); + LOGGER.info("The scheduled server restart config is not set properly, please correct it!"); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 90c846a614..364537156c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.entity.Castle; public final class SiegeGuardManager { - private static Logger _log = Logger.getLogger(SiegeGuardManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(SiegeGuardManager.class.getName()); private final Castle _castle; private final List _siegeGuardSpawn = new ArrayList<>(); @@ -115,7 +115,7 @@ public final class SiegeGuardManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error deleting hired siege guard at " + x + ',' + y + ',' + z + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error deleting hired siege guard at " + x + ',' + y + ',' + z + ": " + e.getMessage(), e); } } @@ -132,7 +132,7 @@ public final class SiegeGuardManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error deleting hired siege guard for castle " + getCastle().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error deleting hired siege guard for castle " + getCastle().getName() + ": " + e.getMessage(), e); } } @@ -165,7 +165,7 @@ public final class SiegeGuardManager } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error spawning siege guards for castle " + getCastle().getName(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error spawning siege guards for castle " + getCastle().getName(), e); } } @@ -215,7 +215,7 @@ public final class SiegeGuardManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for castle " + getCastle().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for castle " + getCastle().getName() + ": " + e.getMessage(), e); } } @@ -245,7 +245,7 @@ public final class SiegeGuardManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error adding siege guard for castle " + getCastle().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error adding siege guard for castle " + getCastle().getName() + ": " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java index adf509358f..5919a7c02d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; public final class SiegeManager { - private static final Logger _log = Logger.getLogger(SiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SiegeManager.class.getName()); private final Map> _controlTowers = new HashMap<>(); private final Map> _flameTowers = new HashMap<>(); @@ -103,7 +103,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -152,7 +152,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); } } @@ -183,7 +183,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); } } _controlTowers.put(castle.getResidenceId(), controlTowers); @@ -290,7 +290,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java index 57c77c7659..f045ab9e91 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; public final class SoDManager { - private static final Logger _log = Logger.getLogger(SoDManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SoDManager.class.getName()); public static String ENERGY_SEEDS = "EnergySeeds"; @@ -44,7 +44,7 @@ public final class SoDManager _SoDLastStateChangeDate = Calendar.getInstance(); loadData(); handleSodStages(); - _log.info("Seed of Destruction Manager: Loaded. Current stage is: " + getSoDState()); + LOGGER.info("Seed of Destruction Manager: Loaded. Current stage is: " + getSoDState()); } public void saveData(byte seedType) @@ -71,7 +71,7 @@ public final class SoDManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); + LOGGER.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); break; } } @@ -125,7 +125,7 @@ public final class SoDManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); + LOGGER.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); } } } @@ -135,7 +135,7 @@ public final class SoDManager final Quest quest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (quest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -156,7 +156,7 @@ public final class SoDManager final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (esQuest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -172,7 +172,7 @@ public final class SoDManager public void setSoDState(int value, boolean doSave) { - _log.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); + LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java index d2f86130f8..c799e1b5d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.util.Util; public class SoIManager { - protected static final Logger _log = Logger.getLogger(SoIManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SoIManager.class.getName()); private static final long SOI_OPEN_TIME = 24 * 60 * 60 * 1000L; @@ -61,7 +61,7 @@ public class SoIManager { openSeed(getOpenedTime()); } - _log.info("Seed of Infinity Manager: Loaded. Current stage is: " + getCurrentStage()); + LOGGER.info("Seed of Infinity Manager: Loaded. Current stage is: " + getCurrentStage()); } public static int getCurrentStage() @@ -97,7 +97,7 @@ public class SoIManager setEkimusCount(0); setHoEDefCount(0); checkStageAndSpawn(); - _log.info("Seed of Infinity Manager: Set to stage " + stage); + LOGGER.info("Seed of Infinity Manager: Set to stage " + stage); } public static boolean isSeedOpen() @@ -112,7 +112,7 @@ public class SoIManager return; } GlobalVariablesManager.getInstance().set("SoI_opened", (System.currentTimeMillis() + time) / 1000L); - _log.info("Seed of Infinity Manager: Opening the seed for " + Util.formatTime((int) time / 1000)); + LOGGER.info("Seed of Infinity Manager: Opening the seed for " + Util.formatTime((int) time / 1000)); spawnOpenedSeed(); DoorData.getInstance().getDoor(14240102).openMe(); @@ -125,7 +125,7 @@ public class SoIManager public static void closeSeed() { - _log.info("Seed of Infinity Manager: Closing the seed."); + LOGGER.info("Seed of Infinity Manager: Closing the seed."); GlobalVariablesManager.getInstance().remove("SoI_opened"); // EnergySeeds.SoiSeedStop(); DoorData.getInstance().getDoor(14240102).closeMe(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java index 711f49e623..f3a499aed7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.util.Util; public final class TerritoryWarManager implements Siegable { - private static final Logger _log = Logger.getLogger(TerritoryWarManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TerritoryWarManager.class.getName()); // SQL private static final String DELETE = "DELETE FROM territory_registrations WHERE castleId = ? and registeredId = ?"; @@ -453,7 +453,7 @@ public final class TerritoryWarManager implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Missing territory for new Ward owner: " + newOwnerId + ";" + territoryId); + LOGGER.warning(getClass().getSimpleName() + ": Missing territory for new Ward owner: " + newOwnerId + ";" + territoryId); } return ret; } @@ -743,7 +743,7 @@ public final class TerritoryWarManager implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": " + e.getMessage(), e); } return null; } @@ -760,7 +760,7 @@ public final class TerritoryWarManager implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: Territory War registration: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: Territory War registration: " + e.getMessage(), e); } } @@ -781,7 +781,7 @@ public final class TerritoryWarManager implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: Territory Data update: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: Territory Data update: " + e.getMessage(), e); } } @@ -832,14 +832,14 @@ public final class TerritoryWarManager implements Siegable } default: { - _log.warning(getClass().getSimpleName() + ": Unknown npc type for " + rs.getInt("id")); + LOGGER.warning(getClass().getSimpleName() + ": Unknown npc type for " + rs.getInt("id")); } } } } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": SpawnList error: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": SpawnList error: " + e.getMessage(), e); } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -877,7 +877,7 @@ public final class TerritoryWarManager implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": territory list error(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": territory list error(): " + e.getMessage(), e); } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -908,7 +908,7 @@ public final class TerritoryWarManager implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": registration list error: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": registration list error: " + e.getMessage(), e); } } @@ -916,7 +916,7 @@ public final class TerritoryWarManager implements Siegable { if (_territoryList == null) { - _log.warning(getClass().getSimpleName() + ": TerritoryList is NULL!"); + LOGGER.warning(getClass().getSimpleName() + ": TerritoryList is NULL!"); return; } final List activeTerritoryList = new LinkedList<>(); @@ -932,7 +932,7 @@ public final class TerritoryWarManager implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Castle missing! CastleId: " + t.getCastleId()); + LOGGER.warning(getClass().getSimpleName() + ": Castle missing! CastleId: " + t.getCastleId()); } } @@ -963,7 +963,7 @@ public final class TerritoryWarManager implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Castle missing! CastleId: " + t.getCastleId()); + LOGGER.warning(getClass().getSimpleName() + ": Castle missing! CastleId: " + t.getCastleId()); } if (fort != null) { @@ -975,7 +975,7 @@ public final class TerritoryWarManager implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Fort missing! FortId: " + t.getFortId()); + LOGGER.warning(getClass().getSimpleName() + ": Fort missing! FortId: " + t.getFortId()); } for (TerritoryNPCSpawn ward : t.getOwnedWard()) { @@ -1015,7 +1015,7 @@ public final class TerritoryWarManager implements Siegable _isTWInProgress = false; if (_territoryList == null) { - _log.warning(getClass().getSimpleName() + ": TerritoryList is NULL!"); + LOGGER.warning(getClass().getSimpleName() + ": TerritoryList is NULL!"); return; } final List activeTerritoryList = new LinkedList<>(); @@ -1031,7 +1031,7 @@ public final class TerritoryWarManager implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Castle missing! CastleId: " + t.getCastleId()); + LOGGER.warning(getClass().getSimpleName() + ": Castle missing! CastleId: " + t.getCastleId()); } } @@ -1067,7 +1067,7 @@ public final class TerritoryWarManager implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Castle missing! CastleId: " + t.getCastleId()); + LOGGER.warning(getClass().getSimpleName() + ": Castle missing! CastleId: " + t.getCastleId()); } if (fort != null) @@ -1079,7 +1079,7 @@ public final class TerritoryWarManager implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Fort missing! FortId: " + t.getFortId()); + LOGGER.warning(getClass().getSimpleName() + ": Fort missing! FortId: " + t.getFortId()); } if (t.getHQ() != null) @@ -1132,7 +1132,7 @@ public final class TerritoryWarManager implements Siegable final Quest twQuest = QuestManager.getInstance().getQuest(qn); if (twQuest == null) { - _log.warning(getClass().getSimpleName() + ": missing main Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing main Quest!"); return false; } for (int castleId : _registeredClans.keySet()) @@ -1255,7 +1255,7 @@ public final class TerritoryWarManager implements Siegable protected class ScheduleStartTWTask implements Runnable { - private final Logger _log = Logger.getLogger(ScheduleStartTWTask.class.getName()); + private final Logger LOGGER = Logger.getLogger(ScheduleStartTWTask.class.getName()); @Override public void run() @@ -1323,14 +1323,14 @@ public final class TerritoryWarManager implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } private class ScheduleEndTWTask implements Runnable { - private final Logger _log = Logger.getLogger(ScheduleEndTWTask.class.getName()); + private final Logger LOGGER = Logger.getLogger(ScheduleEndTWTask.class.getName()); protected ScheduleEndTWTask() { @@ -1387,7 +1387,7 @@ public final class TerritoryWarManager implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -1515,7 +1515,7 @@ public final class TerritoryWarManager implements Siegable public class Territory { - private final Logger _log = Logger.getLogger(Territory.class.getName()); + private final Logger LOGGER = Logger.getLogger(Territory.class.getName()); private final int _territoryId; private final int _castleId; // territory Castle @@ -1556,20 +1556,20 @@ public final class TerritoryWarManager implements Siegable return _territoryWardSpawnPlace; } } - _log.log(Level.WARNING, getClass().getSimpleName() + ": no free Ward spawn found for territory: " + _territoryId); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": no free Ward spawn found for territory: " + _territoryId); for (int i = 0; i < _territoryWardSpawnPlaces.length; i++) { if (_territoryWardSpawnPlaces[i] == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": territory ward spawn place " + i + " is null!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": territory ward spawn place " + i + " is null!"); } else if (_territoryWardSpawnPlaces[i].getNpc() != null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": territory ward spawn place " + i + " has npc name: " + _territoryWardSpawnPlaces[i].getNpc().getName()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": territory ward spawn place " + i + " has npc name: " + _territoryWardSpawnPlaces[i].getNpc().getName()); } else { - _log.log(Level.WARNING, getClass().getSimpleName() + ": territory ward spawn place " + i + " is empty!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": territory ward spawn place " + i + " is empty!"); } } return null; @@ -1584,7 +1584,7 @@ public final class TerritoryWarManager implements Siegable { if ((type < 0) || (type > 3)) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": wrong type(" + type + ") for NPCs spawn change!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": wrong type(" + type + ") for NPCs spawn change!"); return; } for (TerritoryNPCSpawn twSpawn : _spawnList) @@ -1621,7 +1621,7 @@ public final class TerritoryWarManager implements Siegable return; } } - _log.log(Level.WARNING, getClass().getSimpleName() + ": Can't delete wardId: " + wardId + " for territory: " + _territoryId); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Can't delete wardId: " + wardId + " for territory: " + _territoryId); } public int getTerritoryId() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java index bd97cd4b9a..5278dff3ed 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -39,7 +39,7 @@ public class Lottery public static final long SECOND = 1000; public static final long MINUTE = 60000; - protected static final Logger _log = Logger.getLogger(Lottery.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Lottery.class.getName()); private static final String INSERT_LOTTERY = "INSERT INTO games(id, idnr, enddate, prize, newprize) VALUES (?, ?, ?, ?, ?)"; private static final String UPDATE_PRICE = "UPDATE games SET prize=?, newprize=? WHERE id = 1 AND idnr = ?"; @@ -101,7 +101,7 @@ public class Lottery } catch (SQLException e) { - _log.log(Level.WARNING, "Lottery: Could not increase current lottery prize: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Lottery: Could not increase current lottery prize: " + e.getMessage(), e); } } @@ -166,7 +166,7 @@ public class Lottery } catch (SQLException e) { - _log.log(Level.WARNING, "Lottery: Could not restore lottery data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Lottery: Could not restore lottery data: " + e.getMessage(), e); } _isSellingTickets = true; @@ -206,7 +206,7 @@ public class Lottery } catch (SQLException e) { - _log.log(Level.WARNING, "Lottery: Could not store new lottery data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Lottery: Could not store new lottery data: " + e.getMessage(), e); } } } @@ -340,7 +340,7 @@ public class Lottery } catch (SQLException e) { - _log.log(Level.WARNING, "Lottery: Could restore lottery data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Lottery: Could restore lottery data: " + e.getMessage(), e); } final long prize4 = count4 * Config.ALT_LOTTERY_2_AND_1_NUMBER_PRIZE; @@ -397,7 +397,7 @@ public class Lottery } catch (SQLException e) { - _log.log(Level.WARNING, "Lottery: Could not store finished lottery data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Lottery: Could not store finished lottery data: " + e.getMessage(), e); } ThreadPool.schedule(new startLottery(), MINUTE); @@ -521,7 +521,7 @@ public class Lottery } catch (SQLException e) { - _log.log(Level.WARNING, "Lottery: Could not check lottery ticket #" + id + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Lottery: Could not check lottery ticket #" + id + ": " + e.getMessage(), e); } return res; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java index e670006ea4..644980ce31 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class MessageDeletionTask implements Runnable { - private static final Logger _log = Logger.getLogger(MessageDeletionTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MessageDeletionTask.class.getName()); final int _msgId; @@ -76,7 +76,7 @@ public final class MessageDeletionTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); } } MailManager.getInstance().deleteMessageInDb(msg.getId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java index 938ff55c1f..d987589d60 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java @@ -62,7 +62,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class AutoSpawnHandler { - protected static final Logger _log = Logger.getLogger(AutoSpawnHandler.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AutoSpawnHandler.class.getName()); private static final int DEFAULT_INITIAL_SPAWN = 30000; // 30 seconds after registration private static final int DEFAULT_RESPAWN = 3600000; // 1 hour in millisecs @@ -149,7 +149,7 @@ public class AutoSpawnHandler } catch (Exception e) { - _log.log(Level.WARNING, "AutoSpawnHandler: Could not restore spawn data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "AutoSpawnHandler: Could not restore spawn data: " + e.getMessage(), e); } } @@ -235,7 +235,7 @@ public class AutoSpawnHandler } catch (Exception e) { - _log.log(Level.WARNING, "AutoSpawnHandler: Could not auto spawn for NPC ID " + spawnInst._npcId + " (Object ID = " + spawnInst._objectId + "): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "AutoSpawnHandler: Could not auto spawn for NPC ID " + spawnInst._npcId + " (Object ID = " + spawnInst._objectId + "): " + e.getMessage(), e); return false; } @@ -416,7 +416,7 @@ public class AutoSpawnHandler // If there are no set co-ordinates, cancel the spawn task. if (locationList.length == 0) { - _log.info("AutoSpawnHandler: No location co-ords specified for spawn instance (Object ID = " + _objectId + ")."); + LOGGER.info("AutoSpawnHandler: No location co-ords specified for spawn instance (Object ID = " + _objectId + ")."); return; } @@ -494,7 +494,7 @@ public class AutoSpawnHandler } catch (Exception e) { - _log.log(Level.WARNING, "AutoSpawnHandler: An error occurred while initializing spawn instance (Object ID = " + _objectId + "): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "AutoSpawnHandler: An error occurred while initializing spawn instance (Object ID = " + _objectId + "): " + e.getMessage(), e); } } } @@ -522,7 +522,7 @@ public class AutoSpawnHandler if (spawnInst == null) { - _log.info("AutoSpawnHandler: No spawn registered for object ID = " + _objectId + "."); + LOGGER.info("AutoSpawnHandler: No spawn registered for object ID = " + _objectId + "."); return; } @@ -540,7 +540,7 @@ public class AutoSpawnHandler } catch (Exception e) { - _log.log(Level.WARNING, "AutoSpawnHandler: An error occurred while despawning spawn (Object ID = " + _objectId + "): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "AutoSpawnHandler: An error occurred while despawning spawn (Object ID = " + _objectId + "): " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/BlockList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/BlockList.java index 4a7039e65f..549101034e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/BlockList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/BlockList.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BlockList { - private static Logger _log = Logger.getLogger(BlockList.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlockList.class.getName()); private static final Map> OFFLINE_LIST = new ConcurrentHashMap<>(); private final L2PcInstance _owner; @@ -90,7 +90,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); } return list; } @@ -121,7 +121,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CharEffectList.java index f33f07a9dc..e7fab3f163 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -61,7 +61,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate; */ public final class CharEffectList { - private static final Logger _log = Logger.getLogger(CharEffectList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); /** Queue containing all effects from buffs for this effect list. */ private volatile Queue _buffs = new ConcurrentLinkedQueue<>(); /** Queue containing all triggered skills for this effect list. */ @@ -1153,7 +1153,7 @@ public final class CharEffectList // Passive effects don't need stack type! if (!skill.getAbnormalType().isNone()) { - _log.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); + LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); } // Check for passive skill conditions. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 16171c7e74..9aa4d745f8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class CursedWeapon implements INamable { - private static final Logger _log = Logger.getLogger(CursedWeapon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CursedWeapon.class.getName()); // _name is the name of the cursed weapon associated with its ID. private final String _name; @@ -97,7 +97,7 @@ public class CursedWeapon implements INamable if ((_player != null) && _player.isOnline()) { // Remove from player - _log.info(_name + " being removed online."); + LOGGER.info(_name + " being removed online."); _player.abortAttack(); @@ -136,7 +136,7 @@ public class CursedWeapon implements INamable else { // Remove from Db - _log.info(_name + " being removed offline."); + LOGGER.info(_name + " being removed offline."); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?"); @@ -147,7 +147,7 @@ public class CursedWeapon implements INamable del.setInt(2, _itemId); if (del.executeUpdate() != 1) { - _log.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); + LOGGER.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); } // Restore the karma @@ -156,12 +156,12 @@ public class CursedWeapon implements INamable ps.setInt(3, _playerId); if (ps.executeUpdate() != 1) { - _log.warning("Error while updating karma & pkkills for userId " + _playerId); + LOGGER.warning("Error while updating karma & pkkills for userId " + _playerId); } } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); } } } @@ -197,7 +197,7 @@ public class CursedWeapon implements INamable { _item.decayMe(); L2World.getInstance().removeObject(_item); - _log.info(_name + " item has been removed from World."); + LOGGER.info(_name + " item has been removed from World."); } // Delete infos from table if any @@ -496,7 +496,7 @@ public class CursedWeapon implements INamable } catch (SQLException e) { - _log.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); + LOGGER.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Augmentation.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Augmentation.java index 9846479f65..27d9959496 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Augmentation.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Augmentation.java @@ -42,7 +42,7 @@ public final class L2Augmentation public static class AugmentationStatBoni { - private static final Logger _log = Logger.getLogger(AugmentationStatBoni.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AugmentationStatBoni.class.getName()); private final List _options = new ArrayList<>(); private boolean _active; @@ -62,7 +62,7 @@ public final class L2Augmentation } else { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find option: " + stat); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find option: " + stat); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java index 20d4b94c54..e99e5fb95c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -80,7 +80,7 @@ import com.l2jmobius.gameserver.util.Util; public class L2Clan implements IIdentifiable, INamable { - private static final Logger _log = Logger.getLogger(L2Clan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Clan.class.getName()); // SQL queries private static final String INSERT_CLAN_DATA = "INSERT INTO clan_data (clan_id,clan_name,clan_level,hasCastle,blood_alliance_count,blood_oath_count,ally_id,ally_name,leader_id,crest_id,crest_large_id,ally_crest_id,new_leader_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -257,7 +257,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); } } @@ -297,14 +297,14 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); } } broadcastClanStatus(); broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_LORD_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1).addString(member.getName())); - _log.log(Level.INFO, "Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); + LOGGER.log(Level.INFO, "Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); } /** @@ -314,7 +314,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - _log.warning(L2Clan.class.getName() + ": Clan " + getName() + " without clan leader!"); + LOGGER.warning(L2Clan.class.getName() + ": Clan " + getName() + " without clan leader!"); return ""; } return _leader.getName(); @@ -417,7 +417,7 @@ public class L2Clan implements IIdentifiable, INamable final L2ClanMember exMember = _members.remove(objectId); if (exMember == null) { - _log.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); + LOGGER.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); return; } final int leadssubpledge = getLeaderSubPledge(objectId); @@ -879,7 +879,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -923,7 +923,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -941,7 +941,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); } } @@ -978,7 +978,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); } } @@ -1019,7 +1019,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); } } @@ -1051,7 +1051,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); } } @@ -1126,7 +1126,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); } } @@ -1147,7 +1147,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); } } @@ -1189,7 +1189,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); } _notice = notice; @@ -1252,7 +1252,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); + LOGGER.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); } } } @@ -1260,7 +1260,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); } } @@ -1319,7 +1319,7 @@ public class L2Clan implements IIdentifiable, INamable final SubPledge subunit = getSubPledge(subType); if (subunit == null) { - _log.log(Level.WARNING, "Subpledge " + subType + " does not exist for clan " + this); + LOGGER.log(Level.WARNING, "Subpledge " + subType + " does not exist for clan " + this); return oldSkill; } oldSkill = subunit.addNewSkill(newSkill); @@ -1352,7 +1352,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); @@ -1401,7 +1401,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } @@ -1783,7 +1783,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); } } @@ -1892,7 +1892,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); } broadcastToOnlineMembers(new PledgeShowInfoUpdate(_leader.getClan())); @@ -1957,7 +1957,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); } } @@ -1989,7 +1989,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); } } @@ -2025,7 +2025,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } for (L2ClanMember cm : getMembers()) @@ -2061,7 +2061,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); } } } @@ -2177,7 +2177,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); } } } @@ -2730,7 +2730,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); } setLevel(level); @@ -2776,7 +2776,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2813,7 +2813,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); } if (onlyThisClan) @@ -2859,7 +2859,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java index d7313d1b1d..e5915efaa1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2Party extends AbstractPlayerGroup { - private static final Logger _log = Logger.getLogger(L2Party.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Party.class.getName()); // @formatter:off private static final double[] BONUS_EXP_SP = @@ -430,7 +430,7 @@ public class L2Party extends AbstractPlayerGroup } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } SystemMessage msg; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Territory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Territory.java index 7e58c9c83c..3894ef124d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Territory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Territory.java @@ -28,7 +28,7 @@ import com.l2jmobius.commons.util.Rnd; */ public class L2Territory { - private static Logger _log = Logger.getLogger(L2Territory.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2Territory.class.getName()); protected static class Point { @@ -176,7 +176,7 @@ public class L2Territory return new Location(x, y, Rnd.get(zmin, _zMax)); } } - _log.warning("Can't make point for territory " + _terr); + LOGGER.warning("Can't make point for territory " + _terr); return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MacroList.java index a2f85ecd59..711e012d35 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MacroList.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SendMacroList; public class MacroList implements IRestorable { - private static final Logger _log = Logger.getLogger(MacroList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MacroList.class.getName()); private final L2PcInstance _owner; private int _revision; @@ -158,7 +158,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store macro:", e); + LOGGER.log(Level.WARNING, "could not store macro:", e); } } @@ -173,7 +173,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete macro:", e); + LOGGER.log(Level.WARNING, "could not delete macro:", e); } } @@ -219,7 +219,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store shortcuts:", e); + LOGGER.log(Level.WARNING, "could not store shortcuts:", e); return false; } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/ShortCuts.java index c46ef5186c..13431bb913 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/ShortCuts.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; public class ShortCuts implements IRestorable { - private static Logger _log = Logger.getLogger(ShortCuts.class.getName()); + private static Logger LOGGER = Logger.getLogger(ShortCuts.class.getName()); private static final int MAX_SHORTCUTS_PER_BAR = 12; private final L2PcInstance _owner; private final Map _shortCuts = new TreeMap<>(); @@ -99,7 +99,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); } } @@ -164,7 +164,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); } } @@ -190,7 +190,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TerritoryWard.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TerritoryWard.java index b948dd6cde..6a8d7ecf4b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TerritoryWard.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TerritoryWard.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class TerritoryWard { - // private static final Logger _log = Logger.getLogger(CombatFlag.class.getName()); + // private static final Logger LOGGER = Logger.getLogger(CombatFlag.class.getName()); protected L2PcInstance _player = null; public int playerId = 0; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TradeList.java index 29fb42db3f..7a450c4fec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TradeList.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class TradeList { - private static final Logger _log = Logger.getLogger(TradeList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TradeList.class.getName()); private final L2PcInstance _owner; private L2PcInstance _partner; @@ -200,45 +200,45 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Object o = L2World.getInstance().findObject(objectId); if (!(o instanceof L2ItemInstance)) { - _log.warning(_owner.getName() + ": Trying to add something other than an item!"); + LOGGER.warning(_owner.getName() + ": Trying to add something other than an item!"); return null; } final L2ItemInstance item = (L2ItemInstance) o; if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { - _log.warning(_owner.getName() + ": Attempt to add a restricted item!"); + LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) { - _log.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; } if ((count <= 0) || (count > item.getCount())) { - _log.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); return null; } if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -246,7 +246,7 @@ public class TradeList { if (checkitem.getObjectId() == objectId) { - _log.warning(_owner.getName() + ": Attempt to add an item that is already present!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that is already present!"); return null; } } @@ -270,14 +270,14 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); return null; } @@ -288,13 +288,13 @@ public class TradeList if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -317,7 +317,7 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } @@ -331,7 +331,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return null; } partnerList.invalidateConfirmation(); @@ -406,7 +406,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return false; } @@ -471,7 +471,7 @@ public class TradeList // Check for Owner validity if ((_owner == null) || (L2World.getInstance().getPlayer(_owner.getObjectId()) == null)) { - _log.warning("Invalid owner of TradeList"); + LOGGER.warning("Invalid owner of TradeList"); return false; } @@ -481,7 +481,7 @@ public class TradeList final L2ItemInstance item = _owner.checkItemManipulation(titem.getObjectId(), titem.getCount(), "transfer"); if ((item == null) || (item.getCount() < 1)) { - _log.warning(_owner.getName() + ": Invalid Item in TradeList"); + LOGGER.warning(_owner.getName() + ": Invalid Item in TradeList"); return false; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/UIKeysSettings.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/UIKeysSettings.java index c82870131f..c04e85d0da 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/UIKeysSettings.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/UIKeysSettings.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.data.xml.impl.UIData; */ public class UIKeysSettings { - private static final Logger _log = Logger.getLogger(UIKeysSettings.class.getName()); + private static final Logger LOGGER = Logger.getLogger(UIKeysSettings.class.getName()); private final int _playerObjId; private Map> _storedKeys; @@ -111,7 +111,7 @@ public class UIKeysSettings } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveInDB(): " + e.getMessage(), e); } query = "REPLACE INTO character_ui_actions (`charId`, `cat`, `order`, `cmd`, `key`, `tgKey1`, `tgKey2`, `show`) VALUES"; @@ -132,7 +132,7 @@ public class UIKeysSettings } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveInDB(): " + e.getMessage(), e); } _saved = true; } @@ -160,7 +160,7 @@ public class UIKeysSettings } catch (Exception e) { - _log.log(Level.WARNING, "Exception: getCatsFromDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: getCatsFromDB(): " + e.getMessage(), e); } if (_storedCategories.isEmpty()) @@ -193,7 +193,7 @@ public class UIKeysSettings } catch (Exception e) { - _log.log(Level.WARNING, "Exception: getKeysFromDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: getKeysFromDB(): " + e.getMessage(), e); } if (_storedKeys.isEmpty()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 369eac97df..b9d6adffcd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -586,7 +586,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } @@ -635,7 +635,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -731,7 +731,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = _aggroList.get(target); if (ai == null) { - _log.info("Target " + target + " not present in aggro list of " + this); + LOGGER.info("Target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java index da7189a92c..d88374f9b7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -172,7 +172,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class L2Character extends L2Object implements ISkillsHolder, IDeletable { - public static final Logger _log = Logger.getLogger(L2Character.class.getName()); + public static final Logger LOGGER = Logger.getLogger(L2Character.class.getName()); private volatile Set _attackByList; private volatile boolean _isCastingNow = false; @@ -3953,7 +3953,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe distFraction = distPassed / delta; } - // if (Config.DEVELOPER) _log.warning("Move Ticks:" + (gameTicks - m._moveTimestamp) + ", distPassed:" + distPassed + ", distFraction:" + distFraction); + // if (Config.DEVELOPER) LOGGER.warning("Move Ticks:" + (gameTicks - m._moveTimestamp) + ", distPassed:" + distPassed + ", distFraction:" + distFraction); if (distFraction > 1) { @@ -4270,7 +4270,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Temporary fix for character outside world region errors (should not happen) if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) { - _log.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); + LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); if (isPlayer()) { @@ -4663,7 +4663,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - _log.warning("Skill 4515 at level 1 is missing in DP."); + LOGGER.warning("Skill 4515 at level 1 is missing in DP."); } damage = 0; // prevents messing up drop calculation @@ -5432,7 +5432,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } catch (NullPointerException e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } if (mut.getSkillTime() > 0) @@ -5584,7 +5584,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - _log.warning("Skill ID " + curse.getId() + " level " + curse.getLevel() + " is missing in DP!"); + LOGGER.warning("Skill ID " + curse.getId() + " level " + curse.getLevel() + " is missing in DP!"); } return; } @@ -5760,7 +5760,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": callSkill() failed.", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": callSkill() failed.", e); } } @@ -6436,7 +6436,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 0c96731d2e..6aeff17f9c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -743,7 +743,7 @@ public class L2Npc extends L2Character } else { - _log.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); } } } @@ -1337,7 +1337,7 @@ public class L2Npc extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } if (isChannelized()) @@ -1492,7 +1492,7 @@ public class L2Npc extends L2Character final NpcHtmlMessage noTeachMsg = new NpcHtmlMessage(getObjectId()); if (html == null) { - _log.warning("Npc " + npcId + " missing noTeach html!"); + LOGGER.warning("Npc " + npcId + " missing noTeach html!"); noTeachMsg.setHtml("I cannot teach you any skills.
You must find your current class teachers."); } else @@ -1777,7 +1777,7 @@ public class L2Npc extends L2Character if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.log(Level.SEVERE, "Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); + LOGGER.log(Level.SEVERE, "Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java index 3c5adcf79b..9d8a7ac617 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java @@ -380,7 +380,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed stopMove().", e); + LOGGER.log(Level.SEVERE, "Failed stopMove().", e); } try @@ -389,7 +389,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed oustPlayers().", e); + LOGGER.log(Level.SEVERE, "Failed oustPlayers().", e); } final ZoneRegion oldZoneRegion = ZoneManager.getInstance().getRegion(this); @@ -400,7 +400,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } oldZoneRegion.removeFromZones(this); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java index 16f8e738ac..efffd1f4b2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java @@ -181,7 +181,7 @@ public final class L2AuctioneerInstance extends L2Npc } else { - _log.warning("Auctioneer Auction null for AuctionId : " + auctionId); + LOGGER.warning("Auctioneer Auction null for AuctionId : " + auctionId); } player.sendPacket(html); @@ -413,7 +413,7 @@ public final class L2AuctioneerInstance extends L2Npc } else { - _log.warning("Auctioneer Auction null for AuctionBiddedAt : " + player.getClan().getAuctionBiddedAt()); + LOGGER.warning("Auctioneer Auction null for AuctionBiddedAt : " + player.getClan().getAuctionBiddedAt()); } player.sendPacket(html); @@ -445,7 +445,7 @@ public final class L2AuctioneerInstance extends L2Npc } else { - _log.warning("Auctioneer Auction null for getHasHideout : " + player.getClan().getHideoutId()); + LOGGER.warning("Auctioneer Auction null for getHasHideout : " + player.getClan().getHideoutId()); } player.sendPacket(html); @@ -470,7 +470,7 @@ public final class L2AuctioneerInstance extends L2Npc } else { - _log.warning("Clan Hall ID NULL : " + ItemId + " Can be caused by concurent write in ClanHallManager"); + LOGGER.warning("Clan Hall ID NULL : " + ItemId + " Can be caused by concurent write in ClanHallManager"); } player.sendPacket(html); @@ -598,7 +598,7 @@ public final class L2AuctioneerInstance extends L2Npc } else { - _log.warning("Auctioneer Auction null for AuctionBiddedAt : " + player.getClan().getAuctionBiddedAt()); + LOGGER.warning("Auctioneer Auction null for AuctionBiddedAt : " + player.getClan().getAuctionBiddedAt()); } player.sendPacket(html); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java index 05fcc85523..2da4f60adf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java @@ -1771,7 +1771,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } else { - _log.warning("No teleport destination with id:" + val); + LOGGER.warning("No teleport destination with id:" + val); } player.sendPacket(ActionFailed.STATIC_PACKET); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java index 8a84100fce..342da3bf87 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java @@ -61,7 +61,7 @@ public class L2ControlTowerInstance extends L2Tower } catch (Exception e) { - _log.log(Level.WARNING, "Error at L2ControlTowerInstance", e); + LOGGER.log(Level.WARNING, "Error at L2ControlTowerInstance", e); } } _guards.clear(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java index edacdd94d2..8d58f1d0ce 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java @@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; public final class L2CubicInstance implements IIdentifiable { - private static final Logger _log = Logger.getLogger(L2CubicInstance.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2CubicInstance.class.getName()); // Type of Cubics public static final int STORM_CUBIC = 1; @@ -486,7 +486,7 @@ public final class L2CubicInstance implements IIdentifiable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 82dec8ac68..0b10dd116c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -95,7 +95,7 @@ public class L2DecoyInstance extends L2Decoy } catch (Exception e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } @@ -121,7 +121,7 @@ public class L2DecoyInstance extends L2Decoy } catch (Throwable e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index a034fafe61..893b59b413 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -135,7 +135,7 @@ public class L2DefenderInstance extends L2Attackable _hall = getConquerableHall(); if ((_fort == null) && (_castle == null) && (_hall == null)) { - _log.warning("L2DefenderInstance spawned outside of Fortress, Castle or Siegable hall Zone! NpcId: " + getId() + " x=" + getX() + " y=" + getY() + " z=" + getZ()); + LOGGER.warning("L2DefenderInstance spawned outside of Fortress, Castle or Siegable hall Zone! NpcId: " + getId() + " x=" + getX() + " y=" + getY() + " z=" + getZ()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 5f041cf15b..ec80c6f870 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -237,7 +237,7 @@ public class L2DoorInstance extends L2Character } else { - _log.log(Level.WARNING, getClass().getSimpleName() + ": cannot find child id: " + getChildId()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": cannot find child id: " + getChildId()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoormenInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoormenInstance.java index 0fd6b3c9bd..c95d021b84 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoormenInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoormenInstance.java @@ -151,7 +151,7 @@ public class L2DoormenInstance extends L2NpcInstance } else { - _log.warning("No teleport destination with id:" + whereTo); + LOGGER.warning("No teleport destination with id:" + whereTo); } player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DungeonGatekeeperInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DungeonGatekeeperInstance.java index 26f6686665..e4ef681e28 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DungeonGatekeeperInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DungeonGatekeeperInstance.java @@ -174,7 +174,7 @@ public class L2DungeonGatekeeperInstance extends L2Npc } else { - _log.warning("No teleport destination with id:" + val); + LOGGER.warning("No teleport destination with id:" + val); } player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java index beee73d255..8c6f8a7dcb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -255,7 +255,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } else { - _log.warning("Missing htm: " + htmFile + " !"); + LOGGER.warning("Missing htm: " + htmFile + " !"); } } else @@ -1012,7 +1012,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } else { - _log.warning("No teleport destination with id:" + val); + LOGGER.warning("No teleport destination with id:" + val); } player.sendPacket(ActionFailed.STATIC_PACKET); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index adde11f07b..ffcd85412a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -86,14 +86,14 @@ public class L2MerchantInstance extends L2NpcInstance final L2BuyList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } if (!buyList.isNpcAllowed(getId())) { - _log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); + LOGGER.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcBufferInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcBufferInstance.java index acbf9c29f4..906b70bebb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcBufferInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcBufferInstance.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class L2NpcBufferInstance extends L2Npc { - private static final Logger _log = Logger.getLogger(L2NpcBufferInstance.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2NpcBufferInstance.class.getName()); private static final Map pageVal = new HashMap<>(); @@ -118,7 +118,7 @@ public class L2NpcBufferInstance extends L2Npc { if (buffGroupList == null) { - _log.warning("NPC Buffer Warning: npcId = " + npcId + " has no buffGroup set in the bypass for the buff selected."); + LOGGER.warning("NPC Buffer Warning: npcId = " + npcId + " has no buffGroup set in the bypass for the buff selected."); return; } @@ -127,7 +127,7 @@ public class L2NpcBufferInstance extends L2Npc final NpcBufferData npcBuffGroupInfo = NpcBufferTable.getInstance().getSkillInfo(npcId, buffGroup); if (npcBuffGroupInfo == null) { - _log.warning("NPC Buffer Warning: npcId = " + npcId + " Location: " + getX() + ", " + getY() + ", " + getZ() + " Player: " + player.getName() + " has tried to use skill group (" + buffGroup + ") not assigned to the NPC Buffer!"); + LOGGER.warning("NPC Buffer Warning: npcId = " + npcId + " Location: " + getX() + ", " + getY() + ", " + getZ() + " Player: " + player.getName() + " has tried to use skill group (" + buffGroup + ") not assigned to the NPC Buffer!"); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index f01c2f7ba0..39aebac350 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -1354,7 +1354,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Attempted to remove unknown RecipeList: " + recipeId); + LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } for (Shortcut sc : getAllShortCuts()) @@ -1379,7 +1379,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -1395,7 +1395,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -2616,7 +2616,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Skipping null auto-get skill for player: " + toString()); + LOGGER.warning("Skipping null auto-get skill for player: " + toString()); } } } @@ -3219,7 +3219,7 @@ public final class L2PcInstance extends L2Playable final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.log(Level.SEVERE, "Item doesn't exist so cannot be added. Item ID: " + itemId); + LOGGER.log(Level.SEVERE, "Item doesn't exist so cannot be added. Item ID: " + itemId); return null; } // Sends message to client if requested @@ -3265,7 +3265,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof L2EtcItem ? (L2EtcItem) item : null); if (handler == null) { - _log.warning("No item handler registered for Herb ID " + item.getId() + "!"); + LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!"); } else { @@ -3813,7 +3813,7 @@ public final class L2PcInstance extends L2Playable // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { - _log.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); return null; } @@ -3821,19 +3821,19 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return null; } if ((count < 0) || ((count > 1) && !item.isStackable())) { - _log.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); return null; } if (count > item.getCount()) { - _log.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); return null; } @@ -3865,7 +3865,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_protectEndTime > 0))) { - _log.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _protectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -3875,7 +3875,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_teleportProtectEndTime > 0))) { - _log.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _teleportProtectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -4355,7 +4355,7 @@ public final class L2PcInstance extends L2Playable if (!object.isItem()) { // dont try to pickup anything that is not an item :) - _log.warning(this + " trying to pickup wrong target." + getTarget()); + LOGGER.warning(this + " trying to pickup wrong target." + getTarget()); return; } @@ -4447,7 +4447,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } ItemTable.getInstance().destroyItem("Consume", target, this, null); } @@ -5285,11 +5285,11 @@ public final class L2PcInstance extends L2Playable if (isKarmaDrop) { - _log.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } else { - _log.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } if (++dropCount >= dropLimit) @@ -6493,11 +6493,11 @@ public final class L2PcInstance extends L2Playable if (!AdminData.getInstance().hasAccessLevel(level)) { - _log.warning("Tried to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); + LOGGER.warning("Tried to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); } else if (level > 0) { - _log.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); + LOGGER.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); } } @@ -6619,7 +6619,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed updating character online status.", e); + LOGGER.log(Level.SEVERE, "Failed updating character online status.", e); } } @@ -6673,7 +6673,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); return false; } return true; @@ -6800,7 +6800,7 @@ public final class L2PcInstance extends L2Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - _log.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -6953,7 +6953,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed loading character.", e); + LOGGER.log(Level.SEVERE, "Failed loading character.", e); } return player; } @@ -7041,7 +7041,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); } return true; } @@ -7141,7 +7141,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); } } @@ -7167,7 +7167,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); } } @@ -7183,7 +7183,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); } } @@ -7198,7 +7198,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not delete premium item: " + e); + LOGGER.log(Level.SEVERE, "Could not delete premium item: " + e); } } @@ -7323,7 +7323,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); } } @@ -7353,7 +7353,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); } } @@ -7462,7 +7462,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store char effect data: ", e); } } @@ -7494,7 +7494,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char item reuse data: ", e); + LOGGER.log(Level.WARNING, "Could not store char item reuse data: ", e); } } @@ -7599,7 +7599,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); } } @@ -7657,12 +7657,12 @@ public final class L2PcInstance extends L2Playable } // else // { - // _log.warning("Could not store new skill, it's null!"); + // LOGGER.warning("Could not store new skill, it's null!"); // } } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7696,7 +7696,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7723,7 +7723,7 @@ public final class L2PcInstance extends L2Playable if (skill == null) { - _log.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); + LOGGER.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); continue; } @@ -7743,7 +7743,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); } } @@ -7801,7 +7801,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } } @@ -7867,7 +7867,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); } } @@ -7909,7 +7909,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); } // Calculate henna modifiers of this player. @@ -7979,7 +7979,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed removing character henna.", e); + LOGGER.log(Level.SEVERE, "Failed removing character henna.", e); } // Calculate Henna modifiers of this L2PcInstance @@ -8033,7 +8033,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed saving character henna.", e); + LOGGER.log(Level.SEVERE, "Failed saving character henna.", e); } // Send Server->Client HennaInfo packet to this L2PcInstance @@ -8192,7 +8192,7 @@ public final class L2PcInstance extends L2Playable { if (isLocked()) { - _log.warning("Player " + getName() + " tried to restart/logout during class change."); + LOGGER.warning("Player " + getName() + " tried to restart/logout during class change."); return false; } @@ -8524,7 +8524,7 @@ public final class L2PcInstance extends L2Playable if ((sklTargetType == L2TargetType.GROUND) && (worldPosition == null)) { - _log.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); + LOGGER.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -10033,7 +10033,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); return false; } @@ -10118,7 +10118,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); // This must be done in order to maintain data consistency. getSubClasses().remove(classIndex); @@ -10184,7 +10184,7 @@ public final class L2PcInstance extends L2Playable final L2PcTemplate pcTemplate = PlayerTemplateData.getInstance().getTemplate(classId); if (pcTemplate == null) { - _log.severe("Missing template for classId: " + classId); + LOGGER.severe("Missing template for classId: " + classId); throw new Error(); } // Set the template of the L2PcInstance @@ -10262,7 +10262,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -10530,7 +10530,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogin(this), this); @@ -10995,7 +10995,7 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return false; } @@ -11126,7 +11126,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) @@ -11134,13 +11134,13 @@ public final class L2PcInstance extends L2Playable { if (!isOnline()) { - _log.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); + LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } setOnlineStatus(false, true); } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11152,7 +11152,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11164,7 +11164,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove combat flag @@ -11191,7 +11191,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11208,7 +11208,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11220,7 +11220,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Recommendations must be saved before task (timer) is canceled @@ -11230,7 +11230,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop the HP/MP/CP Regeneration task (scheduled tasks) try @@ -11239,7 +11239,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11248,7 +11248,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop crafting, if in progress @@ -11258,7 +11258,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Cancel Attak or Cast @@ -11268,7 +11268,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isChannelized()) @@ -11289,7 +11289,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // If a Party is in progress, leave it (and festival party) @@ -11301,7 +11301,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11326,7 +11326,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // returns pet to control item } @@ -11343,7 +11343,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11363,7 +11363,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11383,7 +11383,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove player from instance and set spawn location if any @@ -11413,7 +11413,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // TvT Event removal @@ -11423,7 +11423,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its inventory and remove them from the world @@ -11433,7 +11433,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its warehouse and remove them from the world @@ -11443,7 +11443,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (Config.WAREHOUSE_CACHE) { @@ -11456,7 +11456,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11465,7 +11465,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isCursedWeaponEquipped()) @@ -11476,7 +11476,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11515,7 +11515,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); } stopAutoSaveTask(); @@ -12304,7 +12304,7 @@ public final class L2PcInstance extends L2Playable { if (killer == null) { - _log.warning(this + " called calculateDeathPenaltyBuffLevel with killer null!"); + LOGGER.warning(this + " called calculateDeathPenaltyBuffLevel with killer null!"); return; } @@ -12678,7 +12678,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); + LOGGER.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); } } @@ -12829,7 +12829,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); } } @@ -12851,7 +12851,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); } @@ -13003,7 +13003,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); } @@ -13024,7 +13024,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); } } @@ -13259,7 +13259,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); } } @@ -13356,7 +13356,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); + LOGGER.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); } } } @@ -13382,7 +13382,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); } } @@ -13624,7 +13624,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on removeFromBossZone(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on removeFromBossZone(): " + e.getMessage(), e); } } @@ -13661,12 +13661,12 @@ public final class L2PcInstance extends L2Playable if (nextLevel == -1) { - _log.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from player " + toString()); removeSkill(skill, true); // there is no lower skill } else { - _log.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } @@ -13810,7 +13810,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); } } @@ -13861,7 +13861,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); } return _time_left; } @@ -13895,7 +13895,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 676c8a1ff7..84a92bc4bf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -556,7 +556,7 @@ public class L2PetInstance extends L2Summon final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -751,7 +751,7 @@ public class L2PetInstance extends L2Summon if (removedItem == null) { - _log.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); + LOGGER.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); } else { @@ -1036,7 +1036,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not store pet effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store pet effect data: ", e); } } @@ -1075,7 +1075,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { @@ -1339,7 +1339,7 @@ public class L2PetInstance extends L2Summon } else { - _log.log(Level.WARNING, "Pet control item null, for pet: " + toString()); + LOGGER.log(Level.WARNING, "Pet control item null, for pet: " + toString()); } super.setName(name); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java index 46da51c81f..254452292d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java @@ -151,7 +151,7 @@ public class L2RaceManagerInstance extends L2Npc case 817: // SystemMessageId.MONSRACE_TICKETS_NOW_AVAILABLE_FOR_S1_RACE { if (_state != ACCEPTING_BETS) - {// _log.info("Race Initializing"); + {// LOGGER.info("Race Initializing"); _state = ACCEPTING_BETS; startRace(); } // else{_log.info("Race open");} @@ -172,7 +172,7 @@ public class L2RaceManagerInstance extends L2Npc } case 819: // SystemMessageId.MONSRACE_S1_TICKET_SALES_CLOSED { - // _log.info("Sales closed"); + // LOGGER.info("Sales closed"); sm.addInt(_raceNumber); _state = WAITING; _minutes = 2; @@ -188,7 +188,7 @@ public class L2RaceManagerInstance extends L2Npc } case 826: // SystemMessageId.MONSRACE_FIRST_PLACE_S1_SECOND_S2 { - // _log.info("Placing"); + // LOGGER.info("Placing"); _state = RACE_END; sm.addInt(MonsterRace.getInstance().getFirstPlace()); sm.addInt(MonsterRace.getInstance().getSecondPlace()); @@ -196,13 +196,13 @@ public class L2RaceManagerInstance extends L2Npc } } // _logn.info("Counter: "+minutes); - // _log.info("State: "+state); + // LOGGER.info("State: "+state); broadcast(sm); - // _log.info("Player's known: "+getKnownPlayers().size()); + // LOGGER.info("Player's known: "+getKnownPlayers().size()); if (type == SystemMessageId.THEY_RE_OFF) { - // _log.info("Starting race"); + // LOGGER.info("Starting race"); _state = STARTING_RACE; startRace(); _minutes = 5; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java index 992b839f6a..673b4502ac 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java @@ -389,7 +389,7 @@ public class L2SepulcherNpcInstance extends L2Npc } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 29c0dac506..f1771c151e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -283,7 +283,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store summon effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store summon effect data: ", e); } } @@ -335,7 +335,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SignsPriestInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SignsPriestInstance.java index 030e876bb8..0ca1610fcd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SignsPriestInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SignsPriestInstance.java @@ -95,7 +95,7 @@ public class L2SignsPriestInstance extends L2Npc } catch (Exception e3) { - _log.warning("Failed to retrieve cabal from bypass command. NpcId: " + getId() + "; Command: " + command); + LOGGER.warning("Failed to retrieve cabal from bypass command. NpcId: " + getId() + "; Command: " + command); } } } @@ -608,7 +608,7 @@ public class L2SignsPriestInstance extends L2Npc } else { - _log.warning("Problem with HTML text " + path); + LOGGER.warning("Problem with HTML text " + path); } } break; @@ -709,7 +709,7 @@ public class L2SignsPriestInstance extends L2Npc } catch (Exception e) { - _log.log(Level.WARNING, "SevenSigns: Error occurred while teleporting player: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "SevenSigns: Error occurred while teleporting player: " + e.getMessage(), e); } break; } @@ -843,7 +843,7 @@ public class L2SignsPriestInstance extends L2Npc } else { - _log.warning("Problem with HTML text " + SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_17.htm: " + path); + LOGGER.warning("Problem with HTML text " + SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_17.htm: " + path); } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java index 0497ee9ce8..de2d0a341f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java @@ -307,7 +307,7 @@ public final class L2TeleporterInstance extends L2Npc } else { - _log.warning("No teleport destination with id:" + val); + LOGGER.warning("No teleport destination with id:" + val); } player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TerritoryWardInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TerritoryWardInstance.java index 54e4252769..87261e49c6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TerritoryWardInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TerritoryWardInstance.java @@ -81,7 +81,7 @@ public final class L2TerritoryWardInstance extends L2Attackable if (getCastle() == null) { - _log.warning("L2TerritoryWardInstance(" + getName() + ") spawned outside Castle Zone!"); + LOGGER.warning("L2TerritoryWardInstance(" + getName() + ") spawned outside Castle Zone!"); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index d2d5d5adeb..efeda9cfad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2VillageMasterInstance extends L2NpcInstance { - private static Logger _log = Logger.getLogger(L2VillageMasterInstance.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2VillageMasterInstance.class.getName()); /** * Creates a village master. @@ -352,7 +352,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } catch (Exception NumberFormatException) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Wrong numeric values for command " + command); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Wrong numeric values for command " + command); } Set subsAvailable = null; @@ -502,7 +502,7 @@ public class L2VillageMasterInstance extends L2NpcInstance */ if (!player.getFloodProtectors().getSubclass().tryPerformAction("add subclass")) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); return; } @@ -570,7 +570,7 @@ public class L2VillageMasterInstance extends L2NpcInstance */ if (!player.getFloodProtectors().getSubclass().tryPerformAction("change class")) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); return; } @@ -661,7 +661,7 @@ public class L2VillageMasterInstance extends L2NpcInstance */ if (!player.getFloodProtectors().getSubclass().tryPerformAction("change class")) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); return; } @@ -1248,7 +1248,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } catch (PatternSyntaxException e) { - _log.warning("ERROR: Wrong pattern for clan name!"); + LOGGER.warning("ERROR: Wrong pattern for clan name!"); pattern = Pattern.compile(".*"); } return pattern.matcher(name).matches(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java index 55358a81ee..dad461dadf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java @@ -107,7 +107,7 @@ public class PetStat extends SummonStat { if (getActiveChar() != null) { - _log.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); + LOGGER.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); } throw e; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 22719268fd..32e272f587 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.zone.type.L2SwampZone; public class PlayableStat extends CharStat { - protected static final Logger _log = Logger.getLogger(PlayableStat.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PlayableStat.class.getName()); public PlayableStat(L2Playable activeChar) { @@ -179,7 +179,7 @@ public class PlayableStat extends CharStat { if (value < 0) { - _log.warning("wrong usage"); + LOGGER.warning("wrong usage"); return false; } final long currentSp = getSp(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index 8cc29585bb..9abdf5c934 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.stats.Formulas; public class CharStatus { - protected static final Logger _log = Logger.getLogger(CharStatus.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(CharStatus.class.getName()); private final L2Character _activeChar; @@ -402,7 +402,7 @@ public class CharStatus } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicAction.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicAction.java index c86f990664..38b83b28fa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicAction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicAction.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public final class CubicAction implements Runnable { - private static final Logger _log = Logger.getLogger(CubicAction.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CubicAction.class.getName()); private final L2CubicInstance _cubic; private final AtomicInteger _currentCount = new AtomicInteger(); private final int _chance; @@ -181,7 +181,7 @@ public final class CubicAction implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicHeal.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicHeal.java index e76167ee62..4bfdb4e6c4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicHeal.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicHeal.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; */ public class CubicHeal implements Runnable { - private static final Logger _log = Logger.getLogger(CubicHeal.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CubicHeal.class.getName()); private final L2CubicInstance _cubic; public CubicHeal(L2CubicInstance cubic) @@ -77,7 +77,7 @@ public class CubicHeal implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java index 3eeeaa4303..6f5cbc1ac3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction; */ public class TrapTask implements Runnable { - private static final Logger _log = Logger.getLogger(TrapTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TrapTask.class.getName()); private static final int TICK = 1000; // 1s private final L2TrapInstance _trap; @@ -84,7 +84,7 @@ public class TrapTask implements Runnable } catch (Exception e) { - _log.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); _trap.unSummon(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java index b9424bcdbe..495e847480 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.LeaveWorld; */ public class GameGuardCheckTask implements Runnable { - private static final Logger _log = Logger.getLogger(GameGuardCheckTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GameGuardCheckTask.class.getName()); private final L2PcInstance _player; @@ -53,7 +53,7 @@ public class GameGuardCheckTask implements Runnable } AdminData.getInstance().broadcastMessageToGMs("Client " + client + " failed to reply GameGuard query and is being kicked!"); - _log.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); + LOGGER.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); client.close(LeaveWorld.STATIC_PACKET); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index f642e18dea..81630a1796 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.Disconnection; */ public final class IllegalPlayerActionTask implements Runnable { - private static final Logger _log = Logger.getLogger("audit"); + private static final Logger LOGGER = Logger.getLogger("audit"); private final String _message; private final IllegalActionPunishmentType _punishment; @@ -81,7 +81,7 @@ public final class IllegalPlayerActionTask implements Runnable //@formatter:off record.setParameters(new Object[] { _actor, _punishment }); //@formatter:on - _log.log(record); + LOGGER.log(record); AdminData.getInstance().broadcastMessageToGMs(_message); if (!_actor.isGM()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index 4bbe695039..b79e1e63db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PetFeedTask implements Runnable { - private static final Logger _log = Logger.getLogger(PetFeedTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PetFeedTask.class.getName()); private final L2PcInstance _player; @@ -100,7 +100,7 @@ public class PetFeedTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); + LOGGER.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/Announcement.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/Announcement.java index 3873f71d14..4e5aa84b0f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/Announcement.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/Announcement.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class Announcement implements IAnnouncement { - protected static final Logger _log = Logger.getLogger(Announcement.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Announcement.class.getName()); private static final String INSERT_QUERY = "INSERT INTO announcements (type, content, author) VALUES (?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE announcements SET type = ?, content = ?, author = ? WHERE id = ?"; @@ -125,7 +125,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -145,7 +145,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -162,7 +162,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java index f85c9affc0..a18af9fc50 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,7 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; - private static final Logger _log = Logger.getLogger(AnnouncementType.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) { @@ -40,7 +40,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); return NORMAL; } @@ -53,7 +53,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); return NORMAL; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index 9fd11cdb88..f8ecfde746 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -114,7 +114,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -137,7 +137,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/buylist/Product.java index bd61933376..39be5c351c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.items.L2Item; */ public final class Product { - private static final Logger _log = Logger.getLogger(Product.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Product.class.getName()); private final int _buyListId; private final L2Item _item; @@ -177,7 +177,7 @@ public final class Product } catch (Exception e) { - _log.log(Level.WARNING, "Failed to save Product buylist_id:" + getBuyListId() + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + getBuyListId() + " item_id:" + getItemId(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index 8d2e52b55c..6eefb3679e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public final class ConditionPlayerGrade extends Condition { - protected static final Logger _log = Logger.getLogger(ConditionPlayerGrade.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ConditionPlayerGrade.class.getName()); // conditional values public static final int COND_NO_GRADE = 0x0001; public static final int COND_D_GRADE = 0x0002; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index ab43023761..4fdcd9bbc1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public abstract class AbstractEffect { - protected static final Logger _log = Logger.getLogger(AbstractEffect.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEffect.class.getName()); // Conditions /** Attach condition. */ @@ -84,7 +84,7 @@ public abstract class AbstractEffect final Class handler = EffectHandler.getInstance().getHandler(name); if (handler == null) { - _log.warning(AbstractEffect.class.getSimpleName() + ": Requested unexistent effect handler: " + name); + LOGGER.warning(AbstractEffect.class.getSimpleName() + ": Requested unexistent effect handler: " + name); return null; } @@ -95,7 +95,7 @@ public abstract class AbstractEffect } catch (NoSuchMethodException | SecurityException e) { - _log.warning(AbstractEffect.class.getSimpleName() + ": Requested unexistent constructor for effect handler: " + name + ": " + e.getMessage()); + LOGGER.warning(AbstractEffect.class.getSimpleName() + ": Requested unexistent constructor for effect handler: " + name + ": " + e.getMessage()); return null; } @@ -105,7 +105,7 @@ public abstract class AbstractEffect } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - _log.warning(AbstractEffect.class.getSimpleName() + ": Unable to initialize effect handler: " + name + ": " + e.getMessage()); + LOGGER.warning(AbstractEffect.class.getSimpleName() + ": Unable to initialize effect handler: " + name + ": " + e.getMessage()); } return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Auction.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Auction.java index 429e350b8d..e482dfa5ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Auction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Auction.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; public class Auction { - protected static final Logger _log = Logger.getLogger(Auction.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Auction.class.getName()); private int _id = 0; private long _endDate; private int _highestBidderId = 0; @@ -130,7 +130,7 @@ public class Auction } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -186,7 +186,7 @@ public class Auction } catch (Exception e) { - _log.log(Level.WARNING, "Exception: Auction.load(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: Auction.load(): " + e.getMessage(), e); } } @@ -217,7 +217,7 @@ public class Auction } catch (Exception e) { - _log.log(Level.WARNING, "Exception: Auction.loadBid(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: Auction.loadBid(): " + e.getMessage(), e); } } @@ -255,7 +255,7 @@ public class Auction } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: saveAuctionDate(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: saveAuctionDate(): " + e.getMessage(), e); } } @@ -295,14 +295,14 @@ public class Auction final L2Clan clan = ClanTable.getInstance().getClanByName(clanName); if (clan == null) { - _log.warning("Clan " + clanName + " doesn't exist!"); + LOGGER.warning("Clan " + clanName + " doesn't exist!"); return; } final ItemContainer cwh = clan.getWarehouse(); if (cwh == null) { - _log.warning("There has been a problem with " + clanName + "'s clan warehouse!"); + LOGGER.warning("There has been a problem with " + clanName + "'s clan warehouse!"); return; } @@ -387,7 +387,7 @@ public class Auction } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Auction.updateInDB(L2PcInstance bidder, int bid): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Auction.updateInDB(L2PcInstance bidder, int bid): " + e.getMessage(), e); } } @@ -402,7 +402,7 @@ public class Auction } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Auction.deleteFromDB(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Auction.deleteFromDB(): " + e.getMessage(), e); } for (Bidder b : _bidders.values()) @@ -432,7 +432,7 @@ public class Auction } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Auction.deleteFromDB(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Auction.deleteFromDB(): " + e.getMessage(), e); } } @@ -489,7 +489,7 @@ public class Auction } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Auction.cancelBid(String bidder): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Auction.cancelBid(String bidder): " + e.getMessage(), e); } returnItem(_bidders.get(bidder).getClanName(), _bidders.get(bidder).getBid(), true); @@ -529,7 +529,7 @@ public class Auction } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Auction.load(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Auction.load(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index 74599dd08c..4e5835fc1c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -55,7 +55,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class BlockCheckerEngine { - protected static final Logger _log = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -308,7 +308,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); + LOGGER.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); } } @@ -415,7 +415,7 @@ public final class BlockCheckerEngine // Wrong arena passed, stop event if (_arena == -1) { - _log.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); + LOGGER.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); return; } _isStarted = true; @@ -497,7 +497,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Spawn the block carrying girl @@ -519,8 +519,8 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } @@ -545,7 +545,7 @@ public final class BlockCheckerEngine { if (_spawn == null) { - _log.warning("HBCE: Block Carrying Girl is null"); + LOGGER.warning("HBCE: Block Carrying Girl is null"); return; } SpawnTable.getInstance().deleteSpawn(_spawn, false); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Castle.java index c054eb1d68..b90efdefb7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -61,7 +61,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Castle extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Castle.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Castle.class.getName()); private final List _doors = new ArrayList<>(); private int _ownerId = 0; @@ -205,7 +205,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -225,7 +225,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -354,7 +354,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; } @@ -505,7 +505,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } oldOwner.setCastleId(0); // Unset has castle flag for old owner for (L2PcInstance member : oldOwner.getOnlineMembers(0)) @@ -587,7 +587,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -664,7 +664,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); } } @@ -685,7 +685,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); } } @@ -705,7 +705,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -782,7 +782,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); } } @@ -802,7 +802,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -829,7 +829,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); } } } @@ -872,7 +872,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -1010,7 +1010,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); } } @@ -1032,7 +1032,7 @@ public final class Castle extends AbstractResidence } else { - _log.warning("Trying to add a null skill for Territory Ward Id: " + wardId + ", skill Id: " + s.getSkillId() + " level: " + s.getSkillLevel() + "!"); + LOGGER.warning("Trying to add a null skill for Territory Ward Id: " + wardId + ", skill Id: " + s.getSkillId() + " level: " + s.getSkillLevel() + "!"); } } } @@ -1057,7 +1057,7 @@ public final class Castle extends AbstractResidence } else { - _log.warning("Trying to remove a null skill for Territory Ward Id: " + wardId + ", skill Id: " + s.getSkillId() + " level: " + s.getSkillLevel() + "!"); + LOGGER.warning("Trying to remove a null skill for Territory Ward Id: " + wardId + ", skill Id: " + s.getSkillId() + " level: " + s.getSkillLevel() + "!"); } } } @@ -1105,7 +1105,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -1129,7 +1129,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); } } final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(getResidenceId()).get(towerIndex); @@ -1154,7 +1154,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index 7b84b090ac..f0876a7b5b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; public abstract class ClanHall { - protected static final Logger _log = Logger.getLogger(ClanHall.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ClanHall.class.getName()); private final int _clanHallId; private ArrayList _doors; @@ -173,7 +173,7 @@ public abstract class ClanHall } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -193,7 +193,7 @@ public abstract class ClanHall } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: ClanHall.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: ClanHall.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -433,7 +433,7 @@ public abstract class ClanHall } else { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Zone is null for clan hall: " + getId() + " " + getName()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Zone is null for clan hall: " + getId() + " " + getName()); } } @@ -454,7 +454,7 @@ public abstract class ClanHall } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: ClanHall.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: ClanHall.loadFunctions(): " + e.getMessage(), e); } } @@ -474,7 +474,7 @@ public abstract class ClanHall } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: ClanHall.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: ClanHall.removeFunctions(int functionType): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Couple.java index e87c7b6fe8..e9ff36d7ef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Couple.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class Couple { - private static final Logger _log = Logger.getLogger(Couple.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Couple.class.getName()); private int _Id = 0; private int _player1Id = 0; @@ -67,7 +67,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); } } @@ -99,7 +99,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); } } @@ -117,7 +117,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); } } @@ -131,7 +131,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java index 1c9127a0a8..82c7f552b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -53,7 +53,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class Duel { - protected static final Logger _log = Logger.getLogger(Duel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Duel.class.getName()); public static final int DUELSTATE_NODUEL = 0; public static final int DUELSTATE_DUELLING = 1; @@ -221,7 +221,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); } } } @@ -264,7 +264,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -289,7 +289,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); } } } @@ -1007,7 +1007,7 @@ public class Duel { if ((player != _playerA) && (player != _playerB)) { - _log.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); + LOGGER.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); } if (_playerA == player) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java index b12abaa689..827583ba23 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Fort extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Fort.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Fort.class.getName()); private final List _doors = new ArrayList<>(); private L2StaticObjectInstance _flagPole = null; @@ -227,7 +227,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Fort extends AbstractResidence { if (clan == null) { - _log.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); + LOGGER.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); return false; } @@ -393,7 +393,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } removeOwner(true); } @@ -493,7 +493,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); } } @@ -603,7 +603,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } @@ -624,7 +624,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); } } @@ -644,7 +644,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -741,7 +741,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); } } @@ -755,7 +755,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -772,7 +772,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); } } @@ -840,7 +840,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -957,7 +957,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); } } } @@ -997,7 +997,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); } } @@ -1143,7 +1143,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1172,7 +1172,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1202,7 +1202,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1237,7 +1237,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 188a32c8c5..bcfc810f45 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -60,7 +60,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class FortSiege implements Siegable { - protected static final Logger _log = Logger.getLogger(FortSiege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortSiege.class.getName()); // SQL private static final String DELETE_FORT_SIEGECLANS_BY_CLAN_ID = "DELETE FROM fortsiege_clans WHERE fort_id = ? AND clan_id = ?"; @@ -83,7 +83,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -170,12 +170,12 @@ public class FortSiege implements Siegable } else { - _log.warning("Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); + LOGGER.warning("Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); } } catch (Exception e) { - _log.log(Level.WARNING, "Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); } } } @@ -196,7 +196,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -219,7 +219,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -293,7 +293,7 @@ public class FortSiege implements Siegable getFort().setVisibleFlag(true); } - _log.info("Siege of " + getFort().getName() + " fort finished."); + LOGGER.info("Siege of " + getFort().getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -345,7 +345,7 @@ public class FortSiege implements Siegable announceToPlayer(sm); saveFortSiege(); - _log.info("Siege of " + getFort().getName() + " fort started."); + LOGGER.info("Siege of " + getFort().getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -523,7 +523,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -670,7 +670,7 @@ public class FortSiege implements Siegable } else { - _log.warning("FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning("FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); } } @@ -806,7 +806,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on removeSiegeClan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on removeSiegeClan: " + e.getMessage(), e); } } @@ -865,7 +865,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new FortSiege.ScheduleStartSiegeTask(60), 0); } - _log.info("Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info("Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); } } } @@ -1003,7 +1003,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1060,7 +1060,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1086,7 +1086,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); } } @@ -1114,7 +1114,7 @@ public class FortSiege implements Siegable catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Hero.java index 16268ebe63..ffb43d25f6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Hero.java @@ -62,7 +62,7 @@ import com.l2jmobius.gameserver.network.serverpackets.UserInfo; */ public class Hero { - private static final Logger _log = Logger.getLogger(Hero.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Hero.class.getName()); private static final String GET_HEROES = "SELECT heroes.charId, characters.char_name, heroes.class_id, heroes.count, heroes.played, heroes.claimed FROM heroes, characters WHERE characters.charId = heroes.charId AND heroes.played = 1"; private static final String GET_ALL_HEROES = "SELECT heroes.charId, characters.char_name, heroes.class_id, heroes.count, heroes.played, heroes.claimed FROM heroes, characters WHERE characters.charId = heroes.charId"; @@ -151,11 +151,11 @@ public class Hero } catch (SQLException e) { - _log.warning("Hero System: Couldnt load Heroes: " + e.getMessage()); + LOGGER.warning("Hero System: Couldnt load Heroes: " + e.getMessage()); } - _log.info("Hero System: Loaded " + HEROES.size() + " Heroes."); - _log.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); + LOGGER.info("Hero System: Loaded " + HEROES.size() + " Heroes."); + LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException @@ -217,7 +217,7 @@ public class Hero } catch (SQLException e) { - _log.warning("Hero System: Couldnt load Hero Message for CharId: " + charId + ": " + e.getMessage()); + LOGGER.warning("Hero System: Couldnt load Hero Message for CharId: " + charId + ": " + e.getMessage()); } } @@ -268,11 +268,11 @@ public class Hero } HERO_DIARY.put(charId, diary); - _log.info("Hero System: Loaded " + diaryentries + " diary entries for Hero: " + CharNameTable.getInstance().getNameById(charId)); + LOGGER.info("Hero System: Loaded " + diaryentries + " diary entries for Hero: " + CharNameTable.getInstance().getNameById(charId)); } catch (SQLException e) { - _log.warning("Hero System: Couldnt load Hero Diary for CharId: " + charId + ": " + e.getMessage()); + LOGGER.warning("Hero System: Couldnt load Hero Diary for CharId: " + charId + ": " + e.getMessage()); } } @@ -401,11 +401,11 @@ public class Hero HERO_COUNTS.put(charId, heroCountData); HERO_FIGHTS.put(charId, fights); - _log.info("Hero System: Loaded " + numberoffights + " fights for Hero: " + CharNameTable.getInstance().getNameById(charId)); + LOGGER.info("Hero System: Loaded " + numberoffights + " fights for Hero: " + CharNameTable.getInstance().getNameById(charId)); } catch (SQLException e) { - _log.warning("Hero System: Couldnt load Hero fights history for CharId: " + charId + ": " + e); + LOGGER.warning("Hero System: Couldnt load Hero fights history for CharId: " + charId + ": " + e); } } @@ -773,7 +773,7 @@ public class Hero } catch (SQLException e) { - _log.warning("Hero System: Couldnt update Heroes: " + e.getMessage()); + LOGGER.warning("Hero System: Couldnt update Heroes: " + e.getMessage()); } } @@ -833,7 +833,7 @@ public class Hero } catch (SQLException e) { - _log.severe("SQL exception while saving DiaryData: " + e.getMessage()); + LOGGER.severe("SQL exception while saving DiaryData: " + e.getMessage()); } } @@ -867,7 +867,7 @@ public class Hero } catch (SQLException e) { - _log.severe("SQL exception while saving HeroMessage:" + e.getMessage()); + LOGGER.severe("SQL exception while saving HeroMessage:" + e.getMessage()); } } @@ -880,7 +880,7 @@ public class Hero } catch (SQLException e) { - _log.warning("Heroes: " + e.getMessage()); + LOGGER.warning("Heroes: " + e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/L2Event.java index a2a36ba6f4..1ee985d8ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/L2Event.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/L2Event.java @@ -50,7 +50,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class L2Event { - protected static final Logger _log = Logger.getLogger(L2Event.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2Event.class.getName()); public static EventState eventState = EventState.OFF; public static String _eventName = ""; public static String _eventCreator = ""; @@ -142,7 +142,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); } } } @@ -177,7 +177,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); } } @@ -299,7 +299,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); } } @@ -395,7 +395,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event participation, an error has occured."; } @@ -471,7 +471,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event, an error has occured."; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Siege.java index 43ac7007be..8fab0df791 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class Siege implements Siegable { - protected static final Logger _log = Logger.getLogger(Siege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Siege.class.getName()); // typeId's public static final byte OWNER = -1; @@ -140,7 +140,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -213,7 +213,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -745,7 +745,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -762,7 +762,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); } } @@ -983,7 +983,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeSiegeClan(): " + e.getMessage(), e); } } @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - _log.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); loadSiegeClan(); @@ -1274,7 +1274,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1359,7 +1359,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1427,7 +1427,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); } } @@ -1480,7 +1480,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getName() + ": Cannot spawn control tower! " + e); + LOGGER.warning(getClass().getName() + ": Cannot spawn control tower! " + e); } } _controlTowerCount = _controlTowers.size(); @@ -1504,7 +1504,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getName() + ": Cannot spawn flame tower! " + e); + LOGGER.warning(getClass().getName() + ": Cannot spawn flame tower! " + e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java index 6dd6658241..3e5170b284 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java @@ -72,7 +72,7 @@ public class TvTEvent REWARDING } - protected static final Logger _log = Logger.getLogger(TvTEvent.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(TvTEvent.class.getName()); /** html path **/ private static final String htmlPath = "data/scripts/custom/events/TvT/TvTManager/"; /** @@ -143,7 +143,7 @@ public class TvTEvent } catch (Exception e) { - _log.log(Level.WARNING, "TvTEventEngine[TvTEvent.startParticipation()]: exception: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "TvTEventEngine[TvTEvent.startParticipation()]: exception: " + e.getMessage(), e); return false; } @@ -276,7 +276,7 @@ public class TvTEvent catch (Exception e) { _TvTEventInstance = 0; - _log.log(Level.WARNING, "TvTEventEngine[TvTEvent.createDynamicInstance]: exception: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "TvTEventEngine[TvTEvent.createDynamicInstance]: exception: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTManager.java index 6675acf114..e9fc544f00 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTManager.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class TvTManager { - protected static final Logger _log = Logger.getLogger(TvTManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(TvTManager.class.getName()); /** * Task for event cycles
@@ -46,11 +46,11 @@ public class TvTManager TvTEvent.init(); scheduleEventStart(); - _log.info("TvTEventEngine[TvTManager.TvTManager()]: Started."); + LOGGER.info("TvTEventEngine[TvTManager.TvTManager()]: Started."); } else { - _log.info("TvTEventEngine[TvTManager.TvTManager()]: Engine is disabled."); + LOGGER.info("TvTEventEngine[TvTManager.TvTManager()]: Engine is disabled."); } } @@ -101,7 +101,7 @@ public class TvTManager } catch (Exception e) { - _log.warning("TvTEventEngine[TvTManager.scheduleEventStart()]: Error figuring out a start time. Check TvTEventInterval in config file."); + LOGGER.warning("TvTEventEngine[TvTManager.scheduleEventStart()]: Error figuring out a start time. Check TvTEventInterval in config file."); } } @@ -113,7 +113,7 @@ public class TvTManager if (!TvTEvent.startParticipation()) { Broadcast.toAllOnlinePlayers("TvT Event: Event was cancelled."); - _log.warning("TvTEventEngine[TvTManager.run()]: Error spawning event npc for participation."); + LOGGER.warning("TvTEventEngine[TvTManager.run()]: Error spawning event npc for participation."); scheduleEventStart(); } @@ -135,7 +135,7 @@ public class TvTManager if (!TvTEvent.startFight()) { Broadcast.toAllOnlinePlayers("TvT Event: Event cancelled due to lack of Participation."); - _log.info("TvTEventEngine[TvTManager.run()]: Lack of registration, abort event."); + LOGGER.info("TvTEventEngine[TvTManager.run()]: Lack of registration, abort event."); scheduleEventStart(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java index 37eacd5ad7..c9e67f43cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java @@ -133,7 +133,7 @@ public final class AuctionableHall extends ClanHall /** Fee Task */ protected class FeeTask implements Runnable { - private final Logger _log = Logger.getLogger(FeeTask.class.getName()); + private final Logger LOGGER = Logger.getLogger(FeeTask.class.getName()); @Override public void run() @@ -207,7 +207,7 @@ public final class AuctionableHall extends ClanHall } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -226,7 +226,7 @@ public final class AuctionableHall extends ClanHall } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java index e3beace5f4..ec57a05333 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java @@ -87,7 +87,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable _hall.setSiege(this); _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000); - _log.config(_hall.getName() + " siege scheduled for " + getSiegeDate().getTime() + "."); + LOGGER.config(_hall.getName() + " siege scheduled for " + getSiegeDate().getTime() + "."); loadAttackers(); } @@ -108,7 +108,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable } catch (Exception e) { - _log.warning(getName() + ": Could not load siege attackers!"); + LOGGER.warning(getName() + ": Could not load siege attackers!"); } } @@ -133,11 +133,11 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable } } } - _log.config(getName() + ": Successfully saved attackers to database."); + LOGGER.config(getName() + ": Successfully saved attackers to database."); } catch (Exception e) { - _log.warning(getName() + ": Couldn't save attacker list!"); + LOGGER.warning(getName() + ": Couldn't save attacker list!"); } } @@ -167,7 +167,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable } catch (Exception e) { - _log.warning(getName() + ": Couldnt load siege guards!"); + LOGGER.warning(getName() + ": Couldnt load siege guards!"); } } @@ -400,7 +400,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable onSiegeEnds(); _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000); - _log.config("Siege of " + _hall.getName() + " scheduled for " + _hall.getSiegeDate().getTime() + "."); + LOGGER.config("Siege of " + _hall.getName() + " scheduled for " + _hall.getSiegeDate().getTime() + "."); _hall.updateSiegeStatus(SiegeStatus.REGISTERING); unSpawnSiegeGuards(); @@ -411,7 +411,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable { cancelSiegeTask(); _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - 3600000); - _log.config(_hall.getName() + " siege scheduled for " + _hall.getSiegeDate().getTime() + "."); + LOGGER.config(_hall.getName() + " siege scheduled for " + _hall.getSiegeDate().getTime() + "."); } public void cancelSiegeTask() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java index 33d5d6516a..2c2593f7d3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java @@ -71,13 +71,13 @@ public final class SiegableHall extends ClanHall } catch (Exception e) { - _log.warning("SiegableHall - " + getName() + ": Wrong schedule_config parameters!"); + LOGGER.warning("SiegableHall - " + getName() + ": Wrong schedule_config parameters!"); } } } else { - _log.warning(getName() + ": Wrong schedule_config value in siegable_halls table, using default (7 days)"); + LOGGER.warning(getName() + ": Wrong schedule_config value in siegable_halls table, using default (7 days)"); } _nextSiege = Calendar.getInstance(); @@ -140,7 +140,7 @@ public final class SiegableHall extends ClanHall } catch (Exception e) { - _log.log(Level.WARNING, "Exception: SiegableHall.updateDb(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: SiegableHall.updateDb(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index b3f2bc4411..2a121516af 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -136,7 +136,7 @@ import com.l2jmobius.gameserver.util.MinionList; */ public abstract class AbstractScript extends ManagedScript { - public static final Logger _log = Logger.getLogger(AbstractScript.class.getName()); + public static final Logger LOGGER = Logger.getLogger(AbstractScript.class.getName()); private final Map> _registeredIds = new ConcurrentHashMap<>(); private final List _listeners = new CopyOnWriteArrayList<>(); @@ -159,17 +159,17 @@ public abstract class AbstractScript extends ManagedScript final EventType eventType = listener.value(); if (method.getParameterCount() != 1) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); continue; } else if (!eventType.isEventClass(method.getParameterTypes()[0])) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); continue; } else if (!eventType.isReturnClass(method.getReturnType())) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); continue; } @@ -204,7 +204,7 @@ public abstract class AbstractScript extends ManagedScript final Range range = (Range) annotation; if (range.from() > range.to()) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -219,7 +219,7 @@ public abstract class AbstractScript extends ManagedScript { if (range.from() > range.to()) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } for (int id = range.from(); id <= range.to(); id++) @@ -233,12 +233,12 @@ public abstract class AbstractScript extends ManagedScript final NpcLevelRange range = (NpcLevelRange) annotation; if (range.from() > range.to()) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -254,12 +254,12 @@ public abstract class AbstractScript extends ManagedScript { if (range.from() > range.to()) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -313,7 +313,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -331,7 +331,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -386,7 +386,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -404,7 +404,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -423,7 +423,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -440,7 +440,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -483,7 +483,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -500,7 +500,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -520,7 +520,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -538,7 +538,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -558,7 +558,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -576,7 +576,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -596,7 +596,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -614,7 +614,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -870,7 +870,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -888,7 +888,7 @@ public abstract class AbstractScript extends ManagedScript { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1441,7 +1441,7 @@ public abstract class AbstractScript extends ManagedScript } default: { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } @@ -1553,7 +1553,7 @@ public abstract class AbstractScript extends ManagedScript } default: { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } } @@ -1854,7 +1854,7 @@ public abstract class AbstractScript extends ManagedScript { if ((x == 0) && (y == 0)) { - _log.log(Level.SEVERE, "addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); + LOGGER.log(Level.SEVERE, "addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); return null; } @@ -1897,7 +1897,7 @@ public abstract class AbstractScript extends ManagedScript } catch (Exception e) { - _log.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); + LOGGER.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); } return null; @@ -2696,7 +2696,7 @@ public abstract class AbstractScript extends ManagedScript final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (!door.isOpen()) { @@ -2714,7 +2714,7 @@ public abstract class AbstractScript extends ManagedScript final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (door.isOpen()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java index f07cb0557b..e230cb18a1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public final class EventDispatcher { - private static final Logger _log = Logger.getLogger(EventDispatcher.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EventDispatcher.class.getName()); protected EventDispatcher() { @@ -83,7 +83,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -172,7 +172,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -237,7 +237,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java index f5eb497106..43589aadfd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class AnnotationEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(AnnotationEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnotationEventListener.class.getName()); private final Method _callback; public AnnotationEventListener(ListenersContainer container, EventType type, Method callback, Object owner, int priority) @@ -54,7 +54,7 @@ public class AnnotationEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java index 9d9e120586..7a96cb1527 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class FunctionEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(FunctionEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FunctionEventListener.class.getName()); private final Function _callback; @SuppressWarnings("unchecked") @@ -50,7 +50,7 @@ public class FunctionEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 7410d4688c..7ba034db8a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class ItemAuction { - static final Logger _log = Logger.getLogger(ItemAuctionManager.class.getName()); + static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName()); private static final long ENDING_TIME_EXTEND_5 = TimeUnit.MILLISECONDS.convert(5, TimeUnit.MINUTES); private static final long ENDING_TIME_EXTEND_3 = TimeUnit.MILLISECONDS.convert(3, TimeUnit.MINUTES); @@ -206,7 +206,7 @@ public final class ItemAuction } catch (SQLException e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } @@ -240,7 +240,7 @@ public final class ItemAuction } catch (SQLException e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 7e56fb6749..6a744f9d31 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class ItemAuctionInstance { - protected static final Logger _log = Logger.getLogger(ItemAuctionInstance.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ItemAuctionInstance.class.getName()); private final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("HH:mm:ss dd.MM.yy"); private static final long START_TIME_SPACE = TimeUnit.MILLISECONDS.convert(1, TimeUnit.MINUTES); @@ -153,7 +153,7 @@ public final class ItemAuctionInstance } catch (IllegalArgumentException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading auction item", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading auction item", e); } } @@ -185,18 +185,18 @@ public final class ItemAuctionInstance } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading auction: " + auctionId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading auction: " + auctionId, e); } } } } catch (SQLException e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed loading auctions.", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Failed loading auctions.", e); return; } - _log.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + _items.size() + " item(s) and registered " + _auctions.size() + " auction(s) for instance " + _instanceId + "."); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + _items.size() + " item(s) and registered " + _auctions.size() + " auction(s) for instance " + _instanceId + "."); checkAndSetCurrentAndNextAuction(); } @@ -329,12 +329,12 @@ public final class ItemAuctionInstance { setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0L))); } - _log.log(Level.INFO, getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0L))); - _log.log(Level.INFO, getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -387,7 +387,7 @@ public final class ItemAuctionInstance } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Failed scheduling auction " + _auction.getAuctionId(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Failed scheduling auction " + _auction.getAuctionId(), e); } } @@ -403,7 +403,7 @@ public final class ItemAuctionInstance throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.STARTED + ", expected: " + state); } - _log.log(Level.INFO, getClass().getSimpleName() + ": Auction " + _auction.getAuctionId() + " has started for instance " + _auction.getInstanceId()); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Auction " + _auction.getAuctionId() + " has started for instance " + _auction.getInstanceId()); checkAndSetCurrentAndNextAuction(); break; } @@ -483,7 +483,7 @@ public final class ItemAuctionInstance player.getWarehouse().addItem("ItemAuction", item, null, null); player.sendPacket(SystemMessageId.YOU_HAVE_BID_THE_HIGHEST_PRICE_AND_HAVE_WON_THE_ITEM_THE_ITEM_CAN_BE_FOUND_IN_YOUR_PERSONAL_WAREHOUSE); - _log.log(Level.INFO, getClass().getSimpleName() + ": Auction " + auction.getAuctionId() + " has finished. Highest bid by " + player.getName() + " for instance " + _instanceId); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Auction " + auction.getAuctionId() + " has finished. Highest bid by " + player.getName() + " for instance " + _instanceId); } else { @@ -492,7 +492,7 @@ public final class ItemAuctionInstance item.updateDatabase(); L2World.getInstance().removeObject(item); - _log.log(Level.INFO, getClass().getSimpleName() + ": Auction " + auction.getAuctionId() + " has finished. Highest bid by " + CharNameTable.getInstance().getNameById(bid.getPlayerObjId()) + " for instance " + _instanceId); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Auction " + auction.getAuctionId() + " has finished. Highest bid by " + CharNameTable.getInstance().getNameById(bid.getPlayerObjId()) + " for instance " + _instanceId); } // Clean all canceled bids @@ -500,7 +500,7 @@ public final class ItemAuctionInstance } else { - _log.log(Level.INFO, getClass().getSimpleName() + ": Auction " + auction.getAuctionId() + " has finished. There have not been any bid for instance " + _instanceId); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Auction " + auction.getAuctionId() + " has finished. There have not been any bid for instance " + _instanceId); } } @@ -540,7 +540,7 @@ public final class ItemAuctionInstance { if (!rset.next()) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Auction data not found for auction: " + auctionId); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Auction data not found for auction: " + auctionId); return null; } auctionItemId = rset.getInt(1); @@ -552,27 +552,27 @@ public final class ItemAuctionInstance if (startingTime >= endingTime) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Invalid starting/ending paramaters for auction: " + auctionId); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Invalid starting/ending paramaters for auction: " + auctionId); return null; } final AuctionItem auctionItem = getAuctionItem(auctionItemId); if (auctionItem == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": AuctionItem: " + auctionItemId + ", not found for auction: " + auctionId); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": AuctionItem: " + auctionItemId + ", not found for auction: " + auctionId); return null; } final ItemAuctionState auctionState = ItemAuctionState.stateForStateId(auctionStateId); if (auctionState == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Invalid auctionStateId: " + auctionStateId + ", for auction: " + auctionId); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Invalid auctionStateId: " + auctionStateId + ", for auction: " + auctionId); return null; } if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { - _log.log(Level.INFO, getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e46344b138..c138bd5589 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; */ public abstract class Inventory extends ItemContainer { - protected static final Logger _log = Logger.getLogger(Inventory.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Inventory.class.getName()); public interface PaperdollListener { @@ -322,7 +322,7 @@ public abstract class Inventory extends ItemContainer } else { - _log.warning("Inventory.ItemSkillsListener.Weapon: Incorrect skill: " + skillInfo + "."); + LOGGER.warning("Inventory.ItemSkillsListener.Weapon: Incorrect skill: " + skillInfo + "."); } } } @@ -457,7 +457,7 @@ public abstract class Inventory extends ItemContainer } else { - _log.warning("Inventory.ItemSkillsListener.Weapon: Incorrect skill: " + skillInfo + "."); + LOGGER.warning("Inventory.ItemSkillsListener.Weapon: Incorrect skill: " + skillInfo + "."); } } } @@ -544,7 +544,7 @@ public abstract class Inventory extends ItemContainer } else { - _log.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); + LOGGER.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); } } } @@ -560,7 +560,7 @@ public abstract class Inventory extends ItemContainer } else { - _log.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); + LOGGER.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); } } } @@ -576,7 +576,7 @@ public abstract class Inventory extends ItemContainer } else { - _log.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); + LOGGER.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); } } } @@ -593,7 +593,7 @@ public abstract class Inventory extends ItemContainer } else { - _log.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); + LOGGER.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); } } } @@ -678,7 +678,7 @@ public abstract class Inventory extends ItemContainer } else { - _log.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); + LOGGER.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); } } } @@ -694,7 +694,7 @@ public abstract class Inventory extends ItemContainer } else { - _log.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); + LOGGER.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); } } } @@ -710,7 +710,7 @@ public abstract class Inventory extends ItemContainer } else { - _log.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); + LOGGER.warning("Inventory.ArmorSetListener: Incorrect skill: " + holder + "."); } } } @@ -1442,8 +1442,8 @@ public abstract class Inventory extends ItemContainer } default: { - _log.info("Unhandled slot type: " + slot); - _log.info(CommonUtil.getTraceString(Thread.currentThread().getStackTrace())); + LOGGER.info("Unhandled slot type: " + slot); + LOGGER.info(CommonUtil.getTraceString(Thread.currentThread().getStackTrace())); } } if (pdollSlot >= 0) @@ -1707,7 +1707,7 @@ public abstract class Inventory extends ItemContainer } default: { - _log.warning("Unknown body slot " + targetSlot + " for Item ID:" + item.getId()); + LOGGER.warning("Unknown body slot " + targetSlot + " for Item ID:" + item.getId()); } } } @@ -1837,7 +1837,7 @@ public abstract class Inventory extends ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 14cdb1b0b6..83be2af576 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public abstract class ItemContainer { - protected static final Logger _log = Logger.getLogger(ItemContainer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ItemContainer.class.getName()); protected final List _items = new CopyOnWriteArrayList<>(); @@ -315,7 +315,7 @@ public abstract class ItemContainer final L2Item template = ItemTable.getInstance().getTemplate(itemId); if (template == null) { - _log.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); + LOGGER.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); return null; } @@ -653,7 +653,7 @@ public abstract class ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index fec3650562..1ba21949ee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -149,7 +149,7 @@ public class Mail extends ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index b3fe902063..acf95a67cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util; public class PcInventory extends Inventory { - private static final Logger _log = Logger.getLogger(PcInventory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PcInventory.class.getName()); private final L2PcInstance _owner; private L2ItemInstance _adena; @@ -722,7 +722,7 @@ public class PcInventory extends Inventory if (_questSlots < 0) { _questSlots = 0; - _log.warning(this + ": QuestInventory size < 0!"); + LOGGER.warning(this + ": QuestInventory size < 0!"); } } } @@ -773,7 +773,7 @@ public class PcInventory extends Inventory } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); } return paperdoll; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java index 4c53789dd8..dda1773eb6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java @@ -71,7 +71,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "addItem()", e); + LOGGER.log(Level.SEVERE, "addItem()", e); } } @@ -96,7 +96,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } _items.clear(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcWarehouse.java index 1cf411994c..49852def7c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcWarehouse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcWarehouse.java @@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class PcWarehouse extends Warehouse { - // private static final Logger _log = Logger.getLogger(PcWarehouse.class.getName()); + // private static final Logger LOGGER = Logger.getLogger(PcWarehouse.class.getName()); private final L2PcInstance _owner; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java index 7f5f0899f0..3e9085e12c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java @@ -85,7 +85,7 @@ public final class L2Armor extends L2Item catch (Exception nfe) { // Incorrect syntax, don't add new skill - _log.info("> Couldnt parse " + skill + " in armor enchant skills! item " + this); + LOGGER.info("> Couldnt parse " + skill + " in armor enchant skills! item " + this); } if ((id > 0) && (level > 0)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java index c96620c61b..47456bce98 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java @@ -92,7 +92,7 @@ public final class L2EtcItem extends L2Item final String[] data = part.split(","); if (data.length != 4) { - _log.info("> Couldnt parse " + part + " in capsuled_items! item " + this); + LOGGER.info("> Couldnt parse " + part + " in capsuled_items! item " + this); continue; } final int itemId = Integer.parseInt(data[0]); @@ -101,7 +101,7 @@ public final class L2EtcItem extends L2Item final double chance = Double.parseDouble(data[3]); if (max < min) { - _log.info("> Max amount < Min amount in " + part + ", item " + this); + LOGGER.info("> Max amount < Min amount in " + part + ", item " + this); continue; } final L2ExtractableProduct product = new L2ExtractableProduct(itemId, min, max, chance); @@ -112,7 +112,7 @@ public final class L2EtcItem extends L2Item // check for handler if (_handler == null) { - _log.warning("Item " + this + " define capsuled_items but missing handler."); + LOGGER.warning("Item " + this + " define capsuled_items but missing handler."); _handler = "ExtractableItems"; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java index a88c4800ad..c796ceef17 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public abstract class L2Item extends ListenersContainer implements IIdentifiable { - protected static final Logger _log = Logger.getLogger(L2Item.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2Item.class.getName()); public static final int TYPE1_WEAPON_RING_EARRING_NECKLACE = 0; public static final int TYPE1_SHIELD_ARMOR = 1; @@ -220,13 +220,13 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable if (id == 0) { - _log.info("Ignoring item_skill(" + element + ") for item " + this + ". Skill id is 0!"); + LOGGER.info("Ignoring item_skill(" + element + ") for item " + this + ". Skill id is 0!"); continue; } if (level == 0) { - _log.info("Ignoring item_skill(" + element + ") for item " + this + ". Skill level is 0!"); + LOGGER.info("Ignoring item_skill(" + element + ") for item " + this + ". Skill level is 0!"); continue; } @@ -235,7 +235,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } catch (Exception e) { - _log.warning("Failed to parse item_skill(" + element + ") for item " + this + "! Format: SkillId0-SkillLevel0[;SkillIdN-SkillLevelN]"); + LOGGER.warning("Failed to parse item_skill(" + element + ") for item " + this + "! Format: SkillId0-SkillLevel0[;SkillIdN-SkillLevelN]"); } } @@ -264,7 +264,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable catch (Exception nfe) { // Incorrect syntax, don't add new skill - _log.info("Couldnt parse " + skills + " in weapon unequip skills! item " + this); + LOGGER.info("Couldnt parse " + skills + " in weapon unequip skills! item " + this); } if ((id > 0) && (level > 0)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Weapon.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Weapon.java index e214492978..60c3e42b2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Weapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Weapon.java @@ -118,7 +118,7 @@ public final class L2Weapon extends L2Item catch (Exception nfe) { // Incorrect syntax, dont add new skill - _log.info("> Couldnt parse " + skill + " in weapon enchant skills! item " + this); + LOGGER.info("> Couldnt parse " + skill + " in weapon enchant skills! item " + this); } if ((id > 0) && (level > 0)) { @@ -144,7 +144,7 @@ public final class L2Weapon extends L2Item catch (Exception nfe) { // Incorrect syntax, don't add new skill - _log.info("> Couldnt parse " + skill + " in weapon onmagic skills! item " + this); + LOGGER.info("> Couldnt parse " + skill + " in weapon onmagic skills! item " + this); } if ((id > 0) && (level > 0) && (chance > 0)) { @@ -171,7 +171,7 @@ public final class L2Weapon extends L2Item catch (Exception nfe) { // Incorrect syntax, don't add new skill - _log.info("> Couldnt parse " + skill + " in weapon oncrit skills! item " + this); + LOGGER.info("> Couldnt parse " + skill + " in weapon oncrit skills! item " + this); } if ((id > 0) && (level > 0) && (chance > 0)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index c59e4e1fed..b4d8325d4e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class AbstractEnchantItem { - protected static final Logger _log = Logger.getLogger(AbstractEnchantItem.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); private static final ItemType[] ENCHANT_TYPES = new ItemType[] { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java index a474cd662b..2a86bd0851 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.holders.RangeChanceHolder; */ public final class EnchantItemGroup { - private static final Logger _log = Logger.getLogger(EnchantItemGroup.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); private final List _chances = new ArrayList<>(); private final String _name; @@ -68,10 +68,10 @@ public final class EnchantItemGroup return holder.getChance(); } } - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); return _chances.get(_chances.size() - 1).getChance(); } - _log.log(Level.WARNING, getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); return -1; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 8f0ed39970..67ab1eb2b6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -132,14 +132,14 @@ public final class EnchantScroll extends AbstractEnchantItem { if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); return -1; } final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); if (group == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); return -1; } return group.getChance(enchantItem.getEnchantLevel()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 13bf9b5854..68b7e11294 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -86,7 +86,7 @@ import com.l2jmobius.gameserver.util.GMAudit; */ public final class L2ItemInstance extends L2Object { - private static final Logger _log = Logger.getLogger(L2ItemInstance.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2ItemInstance.class.getName()); private static final Logger LOG_ITEMS = Logger.getLogger("item"); /** ID of the owner */ @@ -877,7 +877,7 @@ public final class L2ItemInstance extends L2Object // there shall be no previous augmentation.. if (_augmentation != null) { - _log.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + getOwnerId()); + LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + getOwnerId()); return false; } @@ -888,7 +888,7 @@ public final class L2ItemInstance extends L2Object } catch (SQLException e) { - _log.log(Level.SEVERE, "Could not update atributes for item: " + this + " from DB:", e); + LOGGER.log(Level.SEVERE, "Could not update atributes for item: " + this + " from DB:", e); } EventDispatcher.getInstance().notifyEventAsync(new OnPlayerAugment(getActingPlayer(), this, augmentation, true), getItem()); return true; @@ -916,7 +916,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "Could not remove augmentation for item: " + this + " from DB:", e); + LOGGER.log(Level.SEVERE, "Could not remove augmentation for item: " + this + " from DB:", e); } // Notify to scripts. @@ -958,7 +958,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore augmentation and elemental data for item " + this + " from DB: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore augmentation and elemental data for item " + this + " from DB: " + e.getMessage(), e); } } @@ -972,7 +972,7 @@ public final class L2ItemInstance extends L2Object } catch (SQLException e) { - _log.log(Level.SEVERE, "Could not update atributes for item: " + this + " from DB:", e); + LOGGER.log(Level.SEVERE, "Could not update atributes for item: " + this + " from DB:", e); } } @@ -985,7 +985,7 @@ public final class L2ItemInstance extends L2Object } catch (SQLException e) { - _log.log(Level.SEVERE, "Could not update elementals for item: " + this + " from DB:", e); + LOGGER.log(Level.SEVERE, "Could not update elementals for item: " + this + " from DB:", e); } if (_elementals == null) @@ -1006,7 +1006,7 @@ public final class L2ItemInstance extends L2Object } catch (SQLException e) { - _log.log(Level.SEVERE, "Could not update elementals for item: " + this + " from DB:", e); + LOGGER.log(Level.SEVERE, "Could not update elementals for item: " + this + " from DB:", e); } } @@ -1129,7 +1129,7 @@ public final class L2ItemInstance extends L2Object } catch (SQLException e) { - _log.log(Level.SEVERE, "Could not update elementals for item: " + this + " from DB:", e); + LOGGER.log(Level.SEVERE, "Could not update elementals for item: " + this + " from DB:", e); } } @@ -1174,7 +1174,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "Could not remove elemental enchant for item: " + this + " from DB:", e); + LOGGER.log(Level.SEVERE, "Could not remove elemental enchant for item: " + this + " from DB:", e); } } @@ -1183,7 +1183,7 @@ public final class L2ItemInstance extends L2Object */ public static class ScheduleConsumeManaTask implements Runnable { - private static final Logger _log = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); private final L2ItemInstance _shadowItem; public ScheduleConsumeManaTask(L2ItemInstance item) @@ -1204,7 +1204,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -1458,13 +1458,13 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore an item owned by " + ownerId + " from DB:", e); + LOGGER.log(Level.SEVERE, "Could not restore an item owned by " + ownerId + " from DB:", e); return null; } final L2Item item = ItemTable.getInstance().getTemplate(item_id); if (item == null) { - _log.severe("Item item_id=" + item_id + " not known, object_id=" + objectId); + LOGGER.severe("Item item_id=" + item_id + " not known, object_id=" + objectId); return null; } inst = new L2ItemInstance(objectId, item); @@ -1615,7 +1615,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update item " + this + " in DB: Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not update item " + this + " in DB: Reason: " + e.getMessage(), e); } } @@ -1661,7 +1661,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "Could not insert item " + this + " into DB: Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not insert item " + this + " into DB: Reason: " + e.getMessage(), e); } } @@ -1701,7 +1701,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "Could not delete item " + this + " in DB: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not delete item " + this + " in DB: " + e.getMessage(), e); } } @@ -1863,7 +1863,7 @@ public final class L2ItemInstance extends L2Object public static class ScheduleLifeTimeTask implements Runnable { - private static final Logger _log = Logger.getLogger(ScheduleLifeTimeTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScheduleLifeTimeTask.class.getName()); private final L2ItemInstance _limitedItem; public ScheduleLifeTimeTask(L2ItemInstance item) @@ -1883,7 +1883,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -2165,7 +2165,7 @@ public final class L2ItemInstance extends L2Object } else if (id != 0) { - _log.log(Level.INFO, "applyEnchantStats: Couldn't find option: " + id); + LOGGER.log(Level.INFO, "applyEnchantStats: Couldn't find option: " + id); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index e441dee7bd..4c4dd1b68a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public abstract class AbstractOlympiadGame { - protected static final Logger _log = Logger.getLogger(AbstractOlympiadGame.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractOlympiadGame.class.getName()); protected static final Logger _logResults = Logger.getLogger("olympiad"); protected static final String POINTS = "olympiad_points"; @@ -190,7 +190,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return false; } return true; @@ -292,7 +292,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -336,7 +336,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -387,7 +387,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "portPlayersToArena()", e); + LOGGER.log(Level.WARNING, "portPlayersToArena()", e); } } @@ -443,7 +443,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java index 9a14558dc3..1aa4f945ff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class Olympiad extends ListenersContainer { - protected static final Logger _log = Logger.getLogger(Olympiad.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger _logResults = Logger.getLogger("olympiad"); private static final Map NOBLES = new ConcurrentHashMap<>(); @@ -192,12 +192,12 @@ public class Olympiad extends ListenersContainer } catch (Exception e) { - _log.log(Level.WARNING, "Olympiad System: Error loading olympiad data from database: ", e); + LOGGER.log(Level.WARNING, "Olympiad System: Error loading olympiad data from database: ", e); } if (!loaded) { - _log.log(Level.INFO, "Olympiad System: failed to load data from database, trying to load from file."); + LOGGER.log(Level.INFO, "Olympiad System: failed to load data from database, trying to load from file."); final Properties OlympiadProperties = new Properties(); try (InputStream is = new FileInputStream(Config.OLYMPIAD_CONFIG_FILE)) @@ -206,7 +206,7 @@ public class Olympiad extends ListenersContainer } catch (Exception e) { - _log.log(Level.SEVERE, "Olympiad System: Error loading olympiad properties: ", e); + LOGGER.log(Level.SEVERE, "Olympiad System: Error loading olympiad properties: ", e); return; } @@ -249,7 +249,7 @@ public class Olympiad extends ListenersContainer } default: { - _log.warning("Olympiad System: Omg something went wrong in loading!! Period = " + _period); + LOGGER.warning("Olympiad System: Omg something went wrong in loading!! Period = " + _period); return; } } @@ -280,19 +280,19 @@ public class Olympiad extends ListenersContainer } catch (Exception e) { - _log.log(Level.WARNING, "Olympiad System: Error loading noblesse data from database: ", e); + LOGGER.log(Level.WARNING, "Olympiad System: Error loading noblesse data from database: ", e); } synchronized (this) { - _log.info("Olympiad System: Loading Olympiad System...."); + LOGGER.info("Olympiad System: Loading Olympiad System...."); if (_period == 0) { - _log.info("Olympiad System: Currently in Olympiad Period"); + LOGGER.info("Olympiad System: Currently in Olympiad Period"); } else { - _log.info("Olympiad System: Currently in Validation Period"); + LOGGER.info("Olympiad System: Currently in Validation Period"); } long milliToEnd; @@ -305,17 +305,17 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - _log.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); if (_period == 0) { milliToEnd = getMillisToWeekChange(); - _log.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); } } - _log.info("Olympiad System: Loaded " + NOBLES.size() + " Nobles"); + LOGGER.info("Olympiad System: Loaded " + NOBLES.size() + " Nobles"); } public void loadNoblesRank() @@ -334,7 +334,7 @@ public class Olympiad extends ListenersContainer } catch (Exception e) { - _log.log(Level.WARNING, "Olympiad System: Error loading noblesse data from database for Ranking: ", e); + LOGGER.log(Level.WARNING, "Olympiad System: Error loading noblesse data from database for Ranking: ", e); } int rank1 = (int) Math.round(tmpPlace.size() * 0.01); @@ -505,9 +505,9 @@ public class Olympiad extends ListenersContainer final int numHours = (int) Math.floor(countDown % 24); final int numDays = (int) Math.floor((countDown - numHours) / 24); - _log.info("Olympiad System: Competition Period Starts in " + numDays + " days, " + numHours + " hours and " + numMins + " mins."); + LOGGER.info("Olympiad System: Competition Period Starts in " + numDays + " days, " + numHours + " hours and " + numMins + " mins."); - _log.info("Olympiad System: Event starts/started : " + _compStart.getTime()); + LOGGER.info("Olympiad System: Event starts/started : " + _compStart.getTime()); } _scheduledCompStart = ThreadPool.schedule(() -> @@ -520,7 +520,7 @@ public class Olympiad extends ListenersContainer _inCompPeriod = true; Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.SHARPEN_YOUR_SWORDS_TIGHTEN_THE_STITCHING_IN_YOUR_ARMOR_AND_MAKE_HASTE_TO_A_GRAND_OLYMPIAD_MANAGER_BATTLES_IN_THE_GRAND_OLYMPIAD_GAMES_ARE_NOW_TAKING_PLACE)); - _log.info("Olympiad System: Olympiad Game Started"); + LOGGER.info("Olympiad System: Olympiad Game Started"); _logResults.info("Result,Player1,Player2,Player1 HP,Player2 HP,Player1 Damage,Player2 Damage,Points,Classed"); _gameManager = ThreadPool.scheduleAtFixedRate(OlympiadGameManager.getInstance(), 30000, 30000); @@ -543,7 +543,7 @@ public class Olympiad extends ListenersContainer } _inCompPeriod = false; Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.MUCH_CARNAGE_HAS_BEEN_LEFT_FOR_THE_CLEANUP_CREW_OF_THE_OLYMPIAD_STADIUM_BATTLES_IN_THE_GRAND_OLYMPIAD_GAMES_ARE_NOW_OVER)); - _log.info("Olympiad System: Olympiad Game Ended"); + LOGGER.info("Olympiad System: Olympiad Game Ended"); while (OlympiadGameManager.getInstance().isBattleStarted()) // cleared in game manager { @@ -654,7 +654,7 @@ public class Olympiad extends ListenersContainer } else { - _log.warning("Invalid config value for Config.ALT_OLY_PERIOD_MULTIPLIER, must be >= 7"); + LOGGER.warning("Invalid config value for Config.ALT_OLY_PERIOD_MULTIPLIER, must be >= 7"); } break; } @@ -746,7 +746,7 @@ public class Olympiad extends ListenersContainer _compStart.add(Calendar.HOUR_OF_DAY, 24); _compEnd = _compStart.getTimeInMillis() + COMP_PERIOD; - _log.info("Olympiad System: New Schedule @ " + _compStart.getTime()); + LOGGER.info("Olympiad System: New Schedule @ " + _compStart.getTime()); return _compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); } @@ -772,9 +772,9 @@ public class Olympiad extends ListenersContainer _scheduledWeeklyTask = ThreadPool.scheduleAtFixedRate(() -> { addWeeklyPoints(); - _log.info("Olympiad System: Added weekly points to nobles"); + LOGGER.info("Olympiad System: Added weekly points to nobles"); resetWeeklyMatches(); - _log.info("Olympiad System: Reset weekly matches to nobles"); + LOGGER.info("Olympiad System: Reset weekly matches to nobles"); _nextWeeklyChange = Calendar.getInstance().getTimeInMillis() + WEEKLY_PERIOD; }, getMillisToWeekChange(), WEEKLY_PERIOD); @@ -901,7 +901,7 @@ public class Olympiad extends ListenersContainer } catch (SQLException e) { - _log.log(Level.SEVERE, "Olympiad System: Failed to save noblesse data to database: ", e); + LOGGER.log(Level.SEVERE, "Olympiad System: Failed to save noblesse data to database: ", e); } } @@ -929,7 +929,7 @@ public class Olympiad extends ListenersContainer } catch (SQLException e) { - _log.log(Level.SEVERE, "Olympiad System: Failed to save olympiad data to database: ", e); + LOGGER.log(Level.SEVERE, "Olympiad System: Failed to save olympiad data to database: ", e); } //@formatter:off /* @@ -945,7 +945,7 @@ public class Olympiad extends ListenersContainer } catch (Exception e) { - _log.log(Level.WARNING, "Olympiad System: Unable to save olympiad properties to file: ", e); + LOGGER.log(Level.WARNING, "Olympiad System: Unable to save olympiad properties to file: ", e); } */ //@formatter:on @@ -962,7 +962,7 @@ public class Olympiad extends ListenersContainer } catch (SQLException e) { - _log.log(Level.SEVERE, "Olympiad System: Failed to update monthly noblese data: ", e); + LOGGER.log(Level.SEVERE, "Olympiad System: Failed to update monthly noblese data: ", e); } } @@ -1119,7 +1119,7 @@ public class Olympiad extends ListenersContainer } catch (SQLException e) { - _log.warning("Olympiad System: Couldnt load heros from DB"); + LOGGER.warning("Olympiad System: Couldnt load heros from DB"); } } @@ -1141,7 +1141,7 @@ public class Olympiad extends ListenersContainer } catch (SQLException e) { - _log.warning("Olympiad System: Couldn't load olympiad leaders from DB!"); + LOGGER.warning("Olympiad System: Couldn't load olympiad leaders from DB!"); } return names; } @@ -1224,7 +1224,7 @@ public class Olympiad extends ListenersContainer } catch (Exception e) { - _log.log(Level.WARNING, "Could not load last olympiad points:", e); + LOGGER.log(Level.WARNING, "Could not load last olympiad points:", e); } return result; } @@ -1333,7 +1333,7 @@ public class Olympiad extends ListenersContainer } catch (SQLException e) { - _log.warning("Olympiad System: Couldn't delete nobles from DB!"); + LOGGER.warning("Olympiad System: Couldn't delete nobles from DB!"); } NOBLES.clear(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java index c4e80e3456..86c18b684f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.zone.type.L2OlympiadStadiumZone; */ public class OlympiadGameManager implements Runnable { - private static final Logger _log = Logger.getLogger(OlympiadGameManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlympiadGameManager.class.getName()); private volatile boolean _battleStarted = false; private final OlympiadGameTask[] _tasks; @@ -75,7 +75,7 @@ public class OlympiadGameManager implements Runnable _tasks[i++] = new OlympiadGameTask(zone, instanceId); } - _log.log(Level.INFO, "Olympiad System: Loaded " + _tasks.length + " stadiums."); + LOGGER.log(Level.INFO, "Olympiad System: Loaded " + _tasks.length + " stadiums."); } public static OlympiadGameManager getInstance() @@ -175,7 +175,7 @@ public class OlympiadGameManager implements Runnable { OlympiadManager.getInstance().clearRegistered(); _battleStarted = false; - _log.log(Level.INFO, "Olympiad System: All current games finished."); + LOGGER.log(Level.INFO, "Olympiad System: All current games finished."); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 812ed815dc..9af3ff5070 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -143,7 +143,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return false; } return result; @@ -371,7 +371,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (_playerTwo.isDefaulted()) @@ -410,7 +410,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (winside == 1) @@ -426,7 +426,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -567,7 +567,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -716,7 +716,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } @@ -801,9 +801,9 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (SQLException e) { - if (_log.isLoggable(Level.SEVERE)) + if (LOGGER.isLoggable(Level.SEVERE)) { - _log.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); + LOGGER.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 80b5a10ca0..ce2b98257e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class OlympiadGameTask implements Runnable { - protected static final Logger _log = Logger.getLogger(OlympiadGameTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(OlympiadGameTask.class.getName()); protected static final long BATTLE_PERIOD = Config.ALT_OLY_BATTLE; // 6 mins private static final int[] TELEPORT_TO_ARENA_TIMES = @@ -154,7 +154,7 @@ public final class OlympiadGameTask implements Runnable { if ((game != null) && (_state != GameState.IDLE)) { - _log.log(Level.WARNING, "Attempt to overwrite non-finished game in state " + _state); + LOGGER.log(Level.WARNING, "Attempt to overwrite non-finished game in state " + _state); return; } @@ -327,14 +327,14 @@ public final class OlympiadGameTask implements Runnable case CLEANUP: case IDLE: { - _log.log(Level.WARNING, "Unable to return players back in town, exception: " + e.getMessage()); + LOGGER.log(Level.WARNING, "Unable to return players back in town, exception: " + e.getMessage()); _state = GameState.IDLE; _game = null; return; } } - _log.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); _state = GameState.GAME_STOPPED; ThreadPool.schedule(this, 1000); } @@ -392,7 +392,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -409,7 +409,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -437,7 +437,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -454,7 +454,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; @@ -471,7 +471,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -480,7 +480,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -489,7 +489,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -498,7 +498,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -513,7 +513,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -522,7 +522,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -531,7 +531,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -540,7 +540,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -549,7 +549,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java index 0b72f8d5c3..c8a7d7ecbf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java @@ -309,7 +309,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return false; } return result; @@ -595,7 +595,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } return; } @@ -792,7 +792,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } if (winside == 1) @@ -954,7 +954,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } @@ -1057,7 +1057,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on checkDefaulted(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on checkDefaulted(): " + e.getMessage(), e); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 0e154808dc..c46c23f065 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; */ public class PunishmentTask implements Runnable { - protected static final Logger _log = Logger.getLogger(PunishmentTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PunishmentTask.class.getName()); private static final String INSERT_QUERY = "INSERT INTO punishments (`key`, `affect`, `type`, `expiration`, `reason`, `punishedBy`) VALUES (?, ?, ?, ?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE punishments SET expiration = ? WHERE id = ?"; @@ -204,7 +204,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); } } @@ -231,7 +231,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java index f09312d056..f64fe7e3a6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -85,17 +85,17 @@ public class LongTimeEvent extends Quest if (_eventPeriod.isWithinRange(new Date())) { startEvent(); - _log.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); + LOGGER.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); } else if (_eventPeriod.getStartDate().after(new Date())) { final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); - _log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); + LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } else { - _log.info("Event " + _eventName + " has passed... Ignored "); + LOGGER.info("Event " + _eventName + " has passed... Ignored "); } } } @@ -162,19 +162,19 @@ public class LongTimeEvent extends Quest if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.warning(getName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); + LOGGER.warning(getName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); continue; } if (minCount > maxCount) { - _log.warning(getName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); + LOGGER.warning(getName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); continue; } if ((finalChance < 10000) || (finalChance > 1000000)) { - _log.warning(getName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); + LOGGER.warning(getName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); continue; } @@ -182,7 +182,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml droplist block for " + getName() + " event"); + LOGGER.warning("Wrong number format in config.xml droplist block for " + getName() + " event"); } } } @@ -204,7 +204,7 @@ public class LongTimeEvent extends Quest if (NpcData.getInstance().getTemplate(npcId) == null) { - _log.warning(getName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); + LOGGER.warning(getName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); continue; } @@ -212,7 +212,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml spawnlist block for " + getName() + " event"); + LOGGER.warning("Wrong number format in config.xml spawnlist block for " + getName() + " event"); } } } @@ -245,7 +245,7 @@ public class LongTimeEvent extends Quest } catch (Exception e) { - _log.log(Level.WARNING, getName() + " event: error reading " + configFile.getAbsolutePath() + " ! " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getName() + " event: error reading " + configFile.getAbsolutePath() + " ! " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java index 98d8e21248..7e6bb325b4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -497,7 +497,7 @@ public class Quest extends AbstractScript implements IIdentifiable { showError(trigger.getActingPlayer(), e); } - _log.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); return; } if (trigger.getActingPlayer() != null) @@ -517,7 +517,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); } } @@ -532,7 +532,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); } } @@ -829,7 +829,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); } } @@ -898,7 +898,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); } } @@ -913,7 +913,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); } } @@ -928,7 +928,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); } } @@ -943,7 +943,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); } } @@ -960,7 +960,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); } return false; } @@ -1399,10 +1399,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public boolean showError(L2PcInstance player, Throwable t) { - _log.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); + LOGGER.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); if (t.getMessage() == null) { - _log.warning(getClass().getSimpleName() + ": " + t.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + t.getMessage()); } if ((player != null) && player.getAccessLevel().isGm()) { @@ -1489,7 +1489,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - _log.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1520,7 +1520,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - _log.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); @@ -1538,7 +1538,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } // events @@ -1568,7 +1568,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1591,7 +1591,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not update char quest:", e); + LOGGER.log(Level.WARNING, "could not update char quest:", e); } } @@ -1612,7 +1612,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Unable to delete char quest!", e); + LOGGER.log(Level.WARNING, "Unable to delete char quest!", e); } } @@ -1636,7 +1636,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete char quest:", e); + LOGGER.log(Level.WARNING, "could not delete char quest:", e); } } @@ -2515,7 +2515,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if ((id != 0) && (ItemTable.getInstance().getTemplate(id) == null)) { - _log.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); } } _questItemIds = items; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 2461bc71d1..f47ad30563 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.util.Util; */ public final class QuestState { - protected static final Logger _log = Logger.getLogger(QuestState.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestState.class.getName()); /** The name of the quest of this QuestState */ private final String _questName; @@ -260,7 +260,7 @@ public final class QuestState } catch (Exception e) { - _log.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -422,7 +422,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - _log.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; @@ -761,7 +761,7 @@ public final class QuestState String text = HtmCache.getInstance().getHtm(_player.getHtmlPrefix(), "data/scripts/quests/Q00255_Tutorial/" + html); if (text == null) { - _log.warning("missing html page data/scripts/quests/Q00255_Tutorial/" + html); + LOGGER.warning("missing html page data/scripts/quests/Q00255_Tutorial/" + html); text = "File data/scripts/quests/Q00255_Tutorial/" + html + " not found or file is empty."; } _player.sendPacket(new TutorialShowHtml(text)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index ada031aaa8..1fc05bca77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class QuestTimer { - protected static final Logger _log = Logger.getLogger(QuestTimer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestTimer.class.getName()); public class ScheduleTimerTask implements Runnable { @@ -48,7 +48,7 @@ public class QuestTimer } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java index 3ad1e615da..1551a7aed9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -69,7 +69,7 @@ import com.l2jmobius.gameserver.util.Util; public final class Skill implements IIdentifiable { - private static final Logger _log = Logger.getLogger(Skill.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Skill.class.getName()); private static final L2Object[] EMPTY_TARGET_LIST = new L2Object[0]; @@ -297,7 +297,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.warning("Bad data in rideState for skill " + this + " !\n" + e); + LOGGER.warning("Bad data in rideState for skill " + this + " !\n" + e); } } } @@ -373,7 +373,7 @@ public final class Skill implements IIdentifiable { if (capsuled_items.isEmpty()) { - _log.warning("Empty Extractable Item Skill data in Skill Id: " + _id); + LOGGER.warning("Empty Extractable Item Skill data in Skill Id: " + _id); } _extractableItems = parseExtractableSkill(_id, _level, capsuled_items); @@ -1104,7 +1104,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in L2Skill.getTargetList(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in L2Skill.getTargetList(): " + e.getMessage(), e); } } activeChar.sendMessage("Target type of skill is not currently handled."); @@ -1700,7 +1700,7 @@ public final class Skill implements IIdentifiable prodData = prodList.split(","); if (prodData.length < 3) { - _log.warning("Extractable skills data: Error in Skill Id: " + skillId + " Level: " + skillLvl + " -> wrong seperator!"); + LOGGER.warning("Extractable skills data: Error in Skill Id: " + skillId + " Level: " + skillLvl + " -> wrong seperator!"); } List items = null; double chance = 0; @@ -1714,7 +1714,7 @@ public final class Skill implements IIdentifiable final int quantity = Integer.parseInt(prodData[j + 1]); if ((prodId <= 0) || (quantity <= 0)) { - _log.warning("Extractable skills data: Error in Skill Id: " + skillId + " Level: " + skillLvl + " wrong production Id: " + prodId + " or wrond quantity: " + quantity + "!"); + LOGGER.warning("Extractable skills data: Error in Skill Id: " + skillId + " Level: " + skillLvl + " wrong production Id: " + prodId + " or wrond quantity: " + quantity + "!"); } items.add(new ItemHolder(prodId, quantity)); } @@ -1722,14 +1722,14 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.warning("Extractable skills data: Error in Skill Id: " + skillId + " Level: " + skillLvl + " -> incomplete/invalid production data or wrong seperator!"); + LOGGER.warning("Extractable skills data: Error in Skill Id: " + skillId + " Level: " + skillLvl + " -> incomplete/invalid production data or wrong seperator!"); } products.add(new L2ExtractableProductItem(items, chance)); } if (products.isEmpty()) { - _log.warning("Extractable skills data: Error in Skill Id: " + skillId + " Level: " + skillLvl + " -> There are no production items!"); + LOGGER.warning("Extractable skills data: Error in Skill Id: " + skillId + " Level: " + skillLvl + " -> There are no production items!"); } return new L2ExtractableSkill(SkillData.getSkillHashCode(skillId, skillLvl), products); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 971b0d0403..0e4cbb60d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SkillChannelizer implements Runnable { - private static final Logger _log = Logger.getLogger(SkillChannelizer.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SkillChannelizer.class.getName()); private final L2Character _channelizer; private List _channelized; @@ -71,7 +71,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (isChanneling()) { - _log.warning("Character: " + _channelizer + " is attempting to channel skill but he already does!"); + LOGGER.warning("Character: " + _channelizer + " is attempting to channel skill but he already does!"); return; } @@ -85,7 +85,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (!isChanneling()) { - _log.warning("Character: " + _channelizer + " is attempting to stop channel skill but he does not!"); + LOGGER.warning("Character: " + _channelizer + " is attempting to stop channel skill but he does not!"); return; } @@ -150,7 +150,7 @@ public class SkillChannelizer implements Runnable final Skill baseSkill = SkillData.getInstance().getSkill(_skill.getChannelingSkillId(), 1); if (baseSkill == null) { - _log.warning(getClass().getSimpleName() + ": skill " + _skill + " couldn't find effect id skill: " + _skill.getChannelingSkillId() + " !"); + LOGGER.warning(getClass().getSimpleName() + ": skill " + _skill + " couldn't find effect id skill: " + _skill.getChannelingSkillId() + " !"); _channelizer.abortCast(); return; } @@ -193,7 +193,7 @@ public class SkillChannelizer implements Runnable final Skill skill = SkillData.getInstance().getSkill(_skill.getChannelingSkillId(), skillLevel); if (skill == null) { - _log.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + _skill); + LOGGER.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + _skill); _channelizer.abortCast(); return; } @@ -226,7 +226,7 @@ public class SkillChannelizer implements Runnable } catch (Exception e) { - _log.warning("Error while channelizing skill: " + _skill + " channelizer: " + _channelizer + " channelized: " + _channelized + "; " + e.getMessage()); + LOGGER.warning("Error while channelizing skill: " + _skill + " channelizer: " + _channelizer + " channelized: " + _channelized + "; " + e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/BaseStats.java index 95288908a9..bc6844966f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/BaseStats.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/BaseStats.java @@ -43,7 +43,7 @@ public enum BaseStats MEN(new MEN()), NONE(new NONE()); - private static final Logger _log = Logger.getLogger(BaseStats.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseStats.class.getName()); public static final int MAX_STAT_VALUE = 100; @@ -173,7 +173,7 @@ public enum BaseStats } catch (Exception e) { - _log.log(Level.WARNING, "[BaseStats] Could not parse file: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "[BaseStats] Could not parse file: " + e.getMessage(), e); } if (doc != null) @@ -201,7 +201,7 @@ public enum BaseStats } catch (Exception e) { - _log.severe("[BaseStats] Invalid stats value: " + value.getNodeValue() + ", skipping"); + LOGGER.severe("[BaseStats] Invalid stats value: " + value.getNodeValue() + ", skipping"); continue; } @@ -231,7 +231,7 @@ public enum BaseStats } else { - _log.severe("[BaseStats] Invalid stats name: " + statName + ", skipping"); + LOGGER.severe("[BaseStats] Invalid stats name: " + statName + ", skipping"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java index 04c443be8c..8524d8e039 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class AccountVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(AccountVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AccountVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM account_gsdata WHERE account_name = ?"; @@ -64,7 +64,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); return false; } finally @@ -107,7 +107,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); return false; } finally diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java index 3331a3d761..05a4d09037 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class PlayerVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(PlayerVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PlayerVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM character_variables WHERE charId = ?"; @@ -66,7 +66,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); return false; } finally @@ -109,7 +109,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); return false; } finally diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java index 95a1aba234..bf6a8191ce 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java @@ -66,7 +66,7 @@ public abstract class L2ZoneRespawn extends L2ZoneType } default: { - _log.warning(getClass().getSimpleName() + ": Unknown location type: " + type); + LOGGER.warning(getClass().getSimpleName() + ": Unknown location type: " + type); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 04eca534a0..315b690fe3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public abstract class L2ZoneType extends ListenersContainer { - protected static final Logger _log = Logger.getLogger(L2ZoneType.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2ZoneType.class.getName()); private final int _id; protected L2ZoneForm _zone; @@ -188,7 +188,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - _log.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2ClanHallZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2ClanHallZone.java index c5ee36cc90..42157e1282 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2ClanHallZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2ClanHallZone.java @@ -48,7 +48,7 @@ public class L2ClanHallZone extends L2ResidenceZone } else { - _log.warning("L2ClanHallZone: Clan hall with id " + getResidenceId() + " does not exist!"); + LOGGER.warning("L2ClanHallZone: Clan hall with id " + getResidenceId() + " does not exist!"); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 9e28a8a4ee..81d8db8c83 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -95,7 +95,7 @@ public class L2EffectZone extends L2ZoneType final String[] skillSplit = skill.split("-"); if (skillSplit.length != 2) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); } else { @@ -107,7 +107,7 @@ public class L2EffectZone extends L2ZoneType { if (!skill.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2SiegeZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2SiegeZone.java index 5dd96a50fb..2953fcaa7e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2SiegeZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2SiegeZone.java @@ -139,7 +139,7 @@ public class L2SiegeZone extends L2ZoneType } else { - _log.warning("L2SiegeZone: Siegable clan hall with id " + value + " does not exist!"); + LOGGER.warning("L2SiegeZone: Siegable clan hall with id " + value + " does not exist!"); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GameClient.java index bc28d25699..97678b8114 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -59,7 +59,7 @@ import io.netty.channel.ChannelHandlerContext; public final class L2GameClient extends ChannelInboundHandler { protected static final Logger LOGGER = Logger.getLogger(L2GameClient.class.getName()); - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private final int _objectId; @@ -107,13 +107,13 @@ public final class L2GameClient extends ChannelInboundHandler final InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); _addr = address.getAddress(); _channel = ctx.channel(); - LOG_ACCOUNTING.finer("Client Connected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Connected: " + ctx.channel()); } @Override public void channelInactive(ChannelHandlerContext ctx) { - LOG_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); LoginServerThread.getInstance().sendLogout(getAccountName()); IdFactory.getInstance().releaseId(getObjectId()); @@ -333,7 +333,7 @@ public final class L2GameClient extends ChannelInboundHandler objectId, this }); - LOG_ACCOUNTING.log(record); + LOGGER_ACCOUNTING.log(record); } } return answer; @@ -370,7 +370,7 @@ public final class L2GameClient extends ChannelInboundHandler objectId, this }); - LOG_ACCOUNTING.log(record); + LOGGER_ACCOUNTING.log(record); } public static void deleteCharByObjId(int objid) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/NpcStringId.java index c50314fe50..3b51760a47 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/NpcStringId.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { - private static final Logger _log = Logger.getLogger(NpcStringId.class.getName()); + private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; @@ -17812,7 +17812,7 @@ public final class NpcStringId } catch (Exception e) { - _log.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); + LOGGER.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); } } } @@ -17878,7 +17878,7 @@ public final class NpcStringId if (!Config.MULTILANG_NS_ENABLE) { - _log.log(Level.INFO, "NpcStringId: MultiLanguage disabled."); + LOGGER.log(Level.INFO, "NpcStringId: MultiLanguage disabled."); return; } @@ -17901,7 +17901,7 @@ public final class NpcStringId continue; } - _log.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); + LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); try { @@ -17927,21 +17927,21 @@ public final class NpcStringId } if (nsId == null) { - _log.log(Level.WARNING, "NpcStringId: Unknown NSID '" + node.getNodeValue() + "', lang '" + lang + "'."); + LOGGER.log(Level.WARNING, "NpcStringId: Unknown NSID '" + node.getNodeValue() + "', lang '" + lang + "'."); continue; } node = nnmb.getNamedItem("text"); if (node == null) { - _log.log(Level.WARNING, "NpcStringId: No text defined for NSID '" + nsId + "', lang '" + lang + "'."); + LOGGER.log(Level.WARNING, "NpcStringId: No text defined for NSID '" + nsId + "', lang '" + lang + "'."); continue; } text = node.getNodeValue(); if (text.isEmpty() || (text.length() > 255)) { - _log.log(Level.WARNING, "NpcStringId: Invalid text defined for NSID '" + nsId + "' (to long or empty), lang '" + lang + "'."); + LOGGER.log(Level.WARNING, "NpcStringId: Invalid text defined for NSID '" + nsId + "' (to long or empty), lang '" + lang + "'."); continue; } @@ -17953,7 +17953,7 @@ public final class NpcStringId } catch (Exception e) { - _log.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); + LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/SystemMessageId.java index 7af1ab4fd1..465584ec85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/SystemMessageId.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { - private static final Logger _log = Logger.getLogger(SystemMessageId.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; @@ -9775,7 +9775,7 @@ public final class SystemMessageId } catch (Exception e) { - _log.log(Level.WARNING, "SystemMessageId: Failed field access for '" + field.getName() + "'", e); + LOGGER.log(Level.WARNING, "SystemMessageId: Failed field access for '" + field.getName() + "'", e); } } } @@ -9836,7 +9836,7 @@ public final class SystemMessageId if (!Config.MULTILANG_SM_ENABLE) { - _log.log(Level.INFO, "SystemMessageId: MultiLanguage disabled."); + LOGGER.log(Level.INFO, "SystemMessageId: MultiLanguage disabled."); return; } @@ -9859,7 +9859,7 @@ public final class SystemMessageId continue; } - _log.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); + LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); try { @@ -9885,21 +9885,21 @@ public final class SystemMessageId } if (smId == null) { - _log.log(Level.WARNING, "SystemMessageId: Unknown SMID '" + node.getNodeValue() + "', lang '" + lang + "'."); + LOGGER.log(Level.WARNING, "SystemMessageId: Unknown SMID '" + node.getNodeValue() + "', lang '" + lang + "'."); continue; } node = nnmb.getNamedItem("text"); if (node == null) { - _log.log(Level.WARNING, "SystemMessageId: No text defined for SMID '" + smId + "', lang '" + lang + "'."); + LOGGER.log(Level.WARNING, "SystemMessageId: No text defined for SMID '" + smId + "', lang '" + lang + "'."); continue; } text = node.getNodeValue(); if (text.isEmpty() || (text.length() > 255)) { - _log.log(Level.WARNING, "SystemMessageId: Invalid text defined for SMID '" + smId + "' (to long or empty), lang '" + lang + "'."); + LOGGER.log(Level.WARNING, "SystemMessageId: Invalid text defined for SMID '" + smId + "' (to long or empty), lang '" + lang + "'."); continue; } @@ -9911,7 +9911,7 @@ public final class SystemMessageId } catch (Exception e) { - _log.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); + LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Action.java index ff0a4ce4ce..51ca0ec1d2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Action.java @@ -154,7 +154,7 @@ public final class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - _log.warning("[C] Action: Character: " + activeChar.getName() + " requested invalid action: " + _actionId); + LOGGER.warning("[C] Action: Character: " + activeChar.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 0f2178648a..e7c2a09282 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -57,7 +57,7 @@ public final class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - _log.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -67,7 +67,7 @@ public final class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - _log.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + LOGGER.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/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 8fbfb5ee51..e77c34d736 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -63,7 +63,7 @@ public final class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // _log.fine("client: x:"+_x+" y:"+_y+" z:"+_z+ + // LOGGER.fine("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // getClient().getActiveChar().sendPacket(smwl); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 5c7d769f71..3b6f7193e8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.util.Util; public final class CharacterCreate implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cSdddddddddddd private String _name; @@ -118,7 +118,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - _log.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -126,7 +126,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - _log.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -134,7 +134,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairColor > 3) || (_hairColor < 0)) { - _log.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -243,7 +243,7 @@ public final class CharacterCreate implements IClientIncomingPacket newChar, client }); - LOG_ACCOUNTING.log(record); + LOGGER_ACCOUNTING.log(record); } private boolean isValidName(String text) @@ -258,7 +258,7 @@ public final class CharacterCreate implements IClientIncomingPacket } catch (PatternSyntaxException e) // case of illegal pattern { - _log.warning("ERROR : Character name pattern of config is wrong!"); + LOGGER.warning("ERROR : Character name pattern of config is wrong!"); pattern = Pattern.compile(".*"); } final Matcher regexp = pattern.matcher(test); @@ -317,7 +317,7 @@ public final class CharacterCreate implements IClientIncomingPacket final L2ItemInstance item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - _log.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + LOGGER.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/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 7e5f798cd2..c6b51302ce 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -83,7 +83,7 @@ public final class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error:", e); + LOGGER.log(Level.SEVERE, "Error:", e); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 40ae455c2f..4900daea14 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ServerClose; */ public class CharacterSelect implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cd private int _charSlot; @@ -185,7 +185,7 @@ public class CharacterSelect implements IClientIncomingPacket { client }); - LOG_ACCOUNTING.log(record); + LOGGER_ACCOUNTING.log(record); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 72c141859e..3ba611cc05 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -48,7 +48,7 @@ public final class EndScenePlayer implements IClientIncomingPacket } if (activeChar.getMovieId() != _movieId) { - _log.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } activeChar.setMovieId(0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a5a36d2506..e26ead51cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -129,7 +129,7 @@ public class EnterWorld implements IClientIncomingPacket final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { - _log.warning("EnterWorld failed! activeChar returned 'null'."); + LOGGER.warning("EnterWorld failed! activeChar returned 'null'."); Disconnection.of(client).defaultSequence(false); return; } @@ -160,7 +160,7 @@ public class EnterWorld implements IClientIncomingPacket // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) // { - // _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); + // LOGGER.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); // } // Apply special GM properties to the GM when entering diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index a5897000a2..35da9620c0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -43,9 +43,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("[T1:ExGetOnAirShip] x: " + _x); - _log.info("[T1:ExGetOnAirShip] y: " + _y); - _log.info("[T1:ExGetOnAirShip] z: " + _z); - _log.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + 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); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index c82a658ff8..f6be9333c0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index 472f1051b3..b0f55887ee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -27,5 +27,5 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger _log = Logger.getLogger(IClientIncomingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java index dea2cc9eb0..fca6dc2bda 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class Logout implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -65,7 +65,7 @@ public final class Logout implements IClientIncomingPacket if (player.isLocked()) { - _log.warning("Player " + player.getName() + " tried to logout during class change."); + LOGGER.warning("Player " + player.getName() + " tried to logout during class change."); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -116,7 +116,7 @@ public final class Logout implements IClientIncomingPacket { client }); - LOG_ACCOUNTING.log(record); + LOGGER_ACCOUNTING.log(record); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 2f2adf5dbc..1a097857de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -140,7 +140,7 @@ public class MultiSellChoose implements IClientIncomingPacket { if (!entry.isStackable() && (_amount > 1)) { - _log.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell, id:" + _listId + ":" + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell, id:" + _listId + ":" + _entryId); player.setMultiSell(null); return; } @@ -263,7 +263,7 @@ public class MultiSellChoose implements IClientIncomingPacket L2ItemInstance 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! - _log.severe("Character: " + player.getName() + " is trying to cheat in multisell, id:" + _listId + ":" + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to cheat in multisell, id:" + _listId + ":" + _entryId); player.setMultiSell(null); return; } @@ -271,7 +271,7 @@ public class MultiSellChoose implements IClientIncomingPacket // if (itemToTake.isEquipped()) // { // this is a cheat, transaction will be aborted and if any items already taken will not be returned back to inventory! - // _log.severe("Character: " + player.getName() + " is trying to cheat in multisell, exchanging equipped item, merchatnt id:" + merchant.getNpcId()); + // LOGGER.severe("Character: " + player.getName() + " is trying to cheat in multisell, exchanging equipped item, merchatnt id:" + merchant.getNpcId()); // player.setMultiSell(null); // return; // } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index d37a888560..70d43b5e3d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.KeyPacket; */ public final class ProtocolVersion implements IClientIncomingPacket { - private static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + private static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private int _version; @@ -59,7 +59,7 @@ public final class ProtocolVersion implements IClientIncomingPacket _version, client }); - LOG_ACCOUNTING.log(record); + LOGGER_ACCOUNTING.log(record); final KeyPacket pk = new KeyPacket(client.enableCrypt(), 0); client.setProtocolOk(false); client.close(pk); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index b40eeba07a..5875a93ab1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -96,7 +96,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 32000)) { Util.handleIllegalPlayerAction(activeChar, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - _log.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); return; } @@ -114,7 +114,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - _log.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -124,7 +124,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); return; } else if (prevSkillLevel != (_level - 1)) @@ -321,7 +321,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } else { - _log.warning("Null SubClassSkills quest, for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + activeChar.getName() + "!"); + LOGGER.warning("Null SubClassSkills quest, for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + activeChar.getName() + "!"); return; } } @@ -355,12 +355,12 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } else { - _log.warning("Inexistent item for object Id " + itemObjId + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + activeChar.getName() + "!"); + LOGGER.warning("Inexistent item for object Id " + itemObjId + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + activeChar.getName() + "!"); } } else { - _log.warning("Invalid item object Id " + itemOID + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + activeChar.getName() + "!"); + LOGGER.warning("Invalid item object Id " + itemOID + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + activeChar.getName() + "!"); } } } @@ -381,7 +381,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } default: { - _log.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 62270e35aa..075ab83f27 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -53,7 +53,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -77,7 +77,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } @@ -87,11 +87,11 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); } else if (prevSkillLevel != (_level - 1)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 4ab6275fa0..7a33b6d919 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -127,7 +127,7 @@ public final class RequestActionUse implements IClientIncomingPacket if (!(Arrays.binarySearch(allowedActions, _actionId) >= 0)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation()); + LOGGER.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation()); return; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java index d0de180958..f063459137 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java @@ -94,7 +94,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 4cc1813b60..0addedf25d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -109,7 +109,7 @@ public final class RequestBlock implements IClientIncomingPacket } default: { - _log.info("Unknown 0xA9 block type: " + _type); + LOGGER.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java index ebb16423f6..85baf74165 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java @@ -132,7 +132,7 @@ public class RequestBrBuyProduct implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "Could not save Item Mall transaction: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not save Item Mall transaction: " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index b8d33fb1d4..32fba451cf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -179,7 +179,7 @@ public final class RequestBuyItem implements IClientIncomingPacket if (price < 0) { - _log.warning("ERROR, no price found .. wrong buylist ??"); + LOGGER.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 59250e6d0f..d5be9c11f7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty bypass!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty bypass!"); Disconnection.of(client, activeChar).defaultSequence(false); return; } @@ -109,7 +109,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket bypassOriginId = activeChar.validateHtmlAction(_command); if (bypassOriginId == -1) { - _log.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); + LOGGER.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); return; } @@ -139,14 +139,14 @@ public final class RequestBypassToServer implements IClientIncomingPacket { activeChar.sendMessage("The command " + command.substring(6) + " does not exist!"); } - _log.warning(activeChar + " requested not registered admin command '" + command + "'"); + LOGGER.warning(activeChar + " requested not registered admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access rights to use this command!"); - _log.warning("Character " + activeChar.getName() + " tried to use admin command " + command + ", without proper access level!"); + LOGGER.warning("Character " + activeChar.getName() + " tried to use admin command " + command + ", without proper access level!"); return; } @@ -224,7 +224,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); } } else if (_command.startsWith("_match")) @@ -296,13 +296,13 @@ public final class RequestBypassToServer implements IClientIncomingPacket } else { - _log.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - _log.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); + LOGGER.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); if (activeChar.isGM()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index e89faf09f3..30dc374415 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -57,7 +57,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket if (activeChar == null) { - _log.fine("RequestCrystalizeItem: activeChar was null"); + LOGGER.fine("RequestCrystalizeItem: activeChar was null"); return; } @@ -86,7 +86,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket activeChar.sendPacket(ActionFailed.STATIC_PACKET); if ((activeChar.getRace() != Race.DWARF) && (activeChar.getClassId().ordinal() != 117) && (activeChar.getClassId().ordinal() != 55)) { - _log.info("Player " + client + " used crystalize with classid: " + activeChar.getClassId().ordinal()); + LOGGER.info("Player " + client + " used crystalize with classid: " + activeChar.getClassId().ordinal()); } return; } @@ -120,7 +120,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket if (!itemToRemove.getItem().isCrystallizable() || (itemToRemove.getItem().getCrystalCount() <= 0) || (itemToRemove.getItem().getCrystalType() == CrystalType.NONE)) { - _log.warning(activeChar.getName() + " (" + activeChar.getObjectId() + ") tried to crystallize " + itemToRemove.getItem().getId()); + LOGGER.warning(activeChar.getName() + " (" + activeChar.getObjectId() + ") tried to crystallize " + itemToRemove.getItem().getId()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 59065a79b6..d10fe2773a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -160,7 +160,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not delete pet objectid: ", e); + LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 44e2462382..d01225780d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -203,7 +203,7 @@ public final class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - _log.warning(msg); + LOGGER.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index 9105b0062b..66a4363ca8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -42,6 +42,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("Recieved [C]RequestExChangeName name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + LOGGER.info("Recieved [C]RequestExChangeName name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 8f3b149cda..418a73d74e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -74,7 +74,7 @@ public final class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - _log.warning("Wrong Cube Game Team ID: " + _team); + LOGGER.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index dac37bf534..b56ffe252f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -65,7 +65,7 @@ public final class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - _log.warning("Unknown Cube Game Answer ID: " + _answer); + LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index ceac9e059a..8d4a1fa306 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -87,7 +87,7 @@ public final class RequestExMagicSkillUseGround implements IClientIncomingPacket else { activeChar.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 95827b4fce..ad6967a089 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -70,7 +70,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket activeChar.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 3e9f07b184..0a4fee3a3c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -44,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket if (fort == null) { - _log.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); + LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); if (client.getActiveChar() == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java index 60da6a8b71..c93a1e63bb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java @@ -100,7 +100,7 @@ public final class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not del friend objectid: ", e); + LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index b09198912e..66d4bb7272 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -50,7 +50,7 @@ public class RequestGetBossRecord implements IClientIncomingPacket if (_bossId != 0) { - _log.info("C5: RequestGetBossRecord: d: " + _bossId + " ActiveChar: " + activeChar); // should be always 0, log it if isnt 0 for furture research + LOGGER.info("C5: RequestGetBossRecord: d: " + _bossId + " ActiveChar: " + activeChar); // should be always 0, log it if isnt 0 for furture research } final int points = RaidBossPointsManager.getInstance().getPointsByOwnerId(activeChar.getObjectId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 689421fe15..f1f30d1ba1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -79,7 +79,7 @@ public final class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index ee7057acc7..8c05bd29d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -118,7 +118,7 @@ public final class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index fe26789819..d0985b5109 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -65,7 +65,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendActionFailed(); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index c1516e4c2e..a132be2db3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -51,7 +51,7 @@ public final class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - _log.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); } client.sendActionFailed(); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index b50485262c..34caa673aa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -49,7 +49,7 @@ public final class RequestHennaItemRemoveInfo implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendActionFailed(); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 5b0af2d0e3..f44fcb3612 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -74,7 +74,7 @@ public final class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - _log.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); + LOGGER.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); client.sendActionFailed(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index dddf40092a..c69fe6cd2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public final class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - _log.warning("Player " + actor.getName() + " sent empty html link!"); + LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - _log.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - _log.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index baeeeddb8e..9379960122 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -79,7 +79,7 @@ public final class RequestMagicSkillUse implements IClientIncomingPacket activeChar.sendPacket(ActionFailed.STATIC_PACKET); if (_magicId > 0) { - _log.warning("Skill Id " + _magicId + " not found in player: " + activeChar); + LOGGER.warning("Skill Id " + _magicId + " not found in player: " + activeChar); } return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 4ad2fcfa4c..f6571c70cd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -73,7 +73,7 @@ public final class RequestOustPledgeMember implements IClientIncomingPacket final L2ClanMember member = clan.getClanMember(_target); if (member == null) { - _log.warning("Target (" + _target + ") is not member of the clan"); + LOGGER.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayerInstance().isInCombat()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 1e5beec8bf..7077507e48 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -37,6 +37,6 @@ public final class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestPCCafeCouponUse: S: " + _str); + LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 05f6bf1466..9e926ff83a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -123,7 +123,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - _log.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -172,7 +172,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -180,7 +180,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - _log.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java index 892b1187d7..725366cee2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -65,7 +65,7 @@ public class RequestPartyMatchList implements IClientIncomingPacket final PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid); if (_room != null) { - _log.info("PartyMatchRoom #" + _room.getId() + " changed by " + _activeChar.getName()); + LOGGER.info("PartyMatchRoom #" + _room.getId() + " changed by " + _activeChar.getName()); _room.setMaxMembers(_membersmax); _room.setMinLvl(_lvlmin); _room.setMaxLvl(_lvlmax); @@ -90,7 +90,7 @@ public class RequestPartyMatchList implements IClientIncomingPacket final PartyMatchRoom _room = new PartyMatchRoom(_maxid, _roomtitle, _loot, _lvlmin, _lvlmax, _membersmax, _activeChar); - _log.info("PartyMatchRoom #" + _maxid + " created by " + _activeChar.getName()); + LOGGER.info("PartyMatchRoom #" + _maxid + " created by " + _activeChar.getName()); // Remove from waiting list PartyMatchWaitingList.getInstance().removePlayer(_activeChar); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 0f51dd6020..5d1bbee3ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -136,7 +136,7 @@ public final class RequestPetUseItem implements IClientIncomingPacket else { activeChar.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - _log.warning("No item handler registered for itemId: " + item.getId()); + LOGGER.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 33515498df..53c39108b0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -74,7 +74,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - _log.log(Level.SEVERE, "Error while saving petition feedback"); + LOGGER.log(Level.SEVERE, "Error while saving petition feedback"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index a20fe39b42..82ceb9f5a3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public final class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(L2GameClient client) { - // _log.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // _log.info("C5: RequestPledgeMemberInfo S:"+_player); + // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java index 9c3a6eb888..7e1a1948e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java @@ -44,8 +44,8 @@ public final class RequestPledgeMemberPowerInfo implements IClientIncomingPacket @Override public void run(L2GameClient client) { - // _log.info("C5: RequestPledgeMemberPowerInfo d:"+_unk1); - // _log.info("C5: RequestPledgeMemberPowerInfo S:"+_player); + // LOGGER.info("C5: RequestPledgeMemberPowerInfo d:"+_unk1); + // LOGGER.info("C5: RequestPledgeMemberPowerInfo S:"+_player); final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java index fccd667e05..b4a2b08eb3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java @@ -42,8 +42,8 @@ public final class RequestPledgeWarList implements IClientIncomingPacket @Override public void run(L2GameClient client) { - // _log.info("C5: RequestPledgeWarList d:"+_unk1); - // _log.info("C5: RequestPledgeWarList d:"+_tab); + // LOGGER.info("C5: RequestPledgeWarList d:"+_unk1); + // LOGGER.info("C5: RequestPledgeWarList d:"+_tab); final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index d86b334aa9..5cfa70fb12 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -73,7 +73,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -152,7 +152,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket final L2MerchantInstance merchant = (target instanceof L2MerchantInstance) ? (L2MerchantInstance) target : null; if (merchant == null) { - _log.warning(getClass().getName() + " Null merchant!"); + LOGGER.warning(getClass().getName() + " Null merchant!"); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 305e020197..c2f8234fe1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -146,7 +146,7 @@ public final class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - _log.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 08ec379c65..79e0a04cf5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -134,7 +134,7 @@ public final class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 26e3a71072..b4ba4fd82b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -201,7 +201,7 @@ public final class RequestRefundItem implements IClientIncomingPacket final L2ItemInstance item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - _log.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); continue; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index c96cb543de..d2ef24cb44 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack } else { - _log.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } activeChar.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 41abb2e3f9..f2b1232612 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class RequestRestart implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -69,7 +69,7 @@ public final class RequestRestart implements IClientIncomingPacket if (player.isLocked()) { - _log.warning("Player " + player.getName() + " tried to restart during class change."); + LOGGER.warning("Player " + player.getName() + " tried to restart during class change."); client.sendPacket(RestartResponse.valueOf(false)); player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -133,7 +133,7 @@ public final class RequestRestart implements IClientIncomingPacket { client }); - LOG_ACCOUNTING.log(record); + LOGGER_ACCOUNTING.log(record); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 84043cffc6..3cc22377a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -89,7 +89,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else if (!activeChar.isDead()) { - _log.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); + LOGGER.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); return; } @@ -135,7 +135,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getHideoutId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CLANHALL); @@ -163,7 +163,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -185,7 +185,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if (((activeChar.getClan() == null) || (activeChar.getClan().getFortId() == 0)) && !isInDefense) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.FORTRESS); @@ -228,7 +228,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } } - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.SIEGEFLAG); @@ -238,7 +238,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if (!activeChar.isGM() && !activeChar.isFestivalParticipant() && !activeChar.getInventory().haveItemForSelfResurrection()) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (activeChar.isGM() || activeChar.destroyItemByItemId("Feather", 10649, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13300, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13128, 1, activeChar, false)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index e38c5af87e..ffdd158492 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -320,14 +320,14 @@ public final class RequestSendPost implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - _log.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final L2ItemInstance newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, receiver); if (newItem == null) { - _log.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + LOGGER.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/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index a5718fe84e..ec30135d18 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -55,17 +55,17 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((activeChar == null) || (castle == null)) { - _log.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); + LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != activeChar.getClanId())) { - _log.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); return; } else if (!activeChar.isClanLeader()) { - _log.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); return; } else if (!castle.getIsTimeRegistrationOver()) @@ -82,12 +82,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - _log.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - _log.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java index 5c01ec751f..341beed24f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -75,7 +75,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket return; } - // _log.info("RequestStopPledgeWar: By leader or authorized player: " + playerClan.getLeaderName() + " of clan: " + // LOGGER.info("RequestStopPledgeWar: By leader or authorized player: " + playerClan.getLeaderName() + " of clan: " // + playerClan.getName() + " to clan: " + _pledgeName); // L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index a7c4a8bd1c..2de1a7c590 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -58,7 +58,7 @@ public final class RequestSurrenderPledgeWar implements IClientIncomingPacket return; } - _log.info("RequestSurrenderPledgeWar by " + client.getActiveChar().getClan().getName() + " with " + _pledgeName); + LOGGER.info("RequestSurrenderPledgeWar by " + client.getActiveChar().getClan().getName() + " with " + _pledgeName); if (!_clan.isAtWarWith(clan.getId())) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index 52ee74dbd6..0f691b416f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -111,7 +111,7 @@ public final class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - _log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); + LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -119,7 +119,7 @@ public final class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - _log.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); + LOGGER.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -219,7 +219,7 @@ public final class Say2 implements IClientIncomingPacket } else { - _log.info("No handler registered for ChatType: " + _type + " Player: " + client); + LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -267,20 +267,20 @@ public final class Say2 implements IClientIncomingPacket { if (owner.getInventory().getItemByObjectId(id) == null) { - _log.info(owner.getClient() + " trying publish item which doesnt own! ID:" + id); + LOGGER.info(owner.getClient() + " trying publish item which doesnt own! ID:" + id); return false; } ((L2ItemInstance) item).publish(); } else { - _log.info(owner.getClient() + " trying publish object which is not item! Object:" + item); + LOGGER.info(owner.getClient() + " trying publish object which is not item! Object:" + item); return false; } pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - _log.info(owner.getClient() + " sent invalid publish item msg! ID:" + id); + LOGGER.info(owner.getClient() + " sent invalid publish item msg! ID:" + id); return false; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 075a6b702f..716424b435 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -67,14 +67,14 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket activeChar.sendMessage("The command " + command.substring(6) + " does not exists!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 81a33c227f..50cfc7b25b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -130,7 +130,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -177,7 +177,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -189,7 +189,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index acd75fdd61..ac7b32a66b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -172,13 +172,13 @@ public final class SendWareHouseWithDrawList implements IClientIncomingPacket final L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final L2ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java index 9bb544c7a3..9dcf41a235 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -340,7 +340,7 @@ public final class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - _log.log(Level.WARNING, "Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + LOGGER.log(Level.WARNING, "Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java index a887fd62a3..a147723d90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java @@ -64,8 +64,8 @@ public class ValidatePosition implements IClientIncomingPacket if (Config.DEVELOPER) { - _log.fine("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); - _log.fine("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); + LOGGER.fine("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); + LOGGER.fine("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); } if ((_x == 0) && (_y == 0)) @@ -191,7 +191,7 @@ public class ValidatePosition implements IClientIncomingPacket { if (Config.DEVELOPER) { - _log.info(activeChar.getName() + ": Synchronizing position Server --> Client"); + LOGGER.info(activeChar.getName() + ": Synchronizing position Server --> Client"); } activeChar.sendPacket(new ValidateLocation(activeChar)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java index 110234858c..aadedfaec6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java @@ -29,7 +29,7 @@ import com.l2jmobius.commons.network.BaseSendablePacket; */ public class BlowFishKey extends BaseSendablePacket { - private static Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param blowfishKey @@ -48,7 +48,7 @@ public class BlowFishKey extends BaseSendablePacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 3973f7ef7a..e7a4566bea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -75,7 +75,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - _log.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); _html = html.substring(0, 17200); } @@ -93,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - _log.warning("missing html page " + path); + LOGGER.warning("missing html page " + path); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index f84efa2d4e..d1ebb8ed74 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -143,7 +143,7 @@ public abstract class AbstractMessagePacket> { _params = Arrays.copyOf(_params, _paramIndex + 1); _smId.setParamCount(_paramIndex + 1); - _log.log(Level.INFO, "Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + LOGGER.log(Level.INFO, "Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } _params[_paramIndex++] = param; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 33580c5142..d44a841243 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { - private static Logger _log = Logger.getLogger(CharSelectionInfo.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); private final String _loginName; private final int _sessionId; private int _activeId; @@ -193,7 +193,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } return new CharSelectInfoPackage[0]; } @@ -217,7 +217,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); } } @@ -324,7 +324,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java index 20bfa2c45c..eba6442381 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java @@ -59,7 +59,7 @@ public class ExBrRecentProductList implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore Item Mall transaction: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore Item Mall transaction: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index efded3aea8..ab7d15e96c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -42,7 +42,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index ffbe29c67a..70e9798001 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -43,7 +43,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index ea5028c109..e8e925f7b5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -51,7 +51,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - _log.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + LOGGER.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/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b70c29e3ff..9cec395027 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger _log = Logger.getLogger(IClientOutgoingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); static final int[] PAPERDOLL_ORDER = new int[] { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index b1fdc7ad4b..c4934f2f47 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -60,7 +60,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - _log.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 8be2d35257..655363bc17 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -57,7 +57,7 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket } else { - _log.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); + LOGGER.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 51bceb1542..23abb96c69 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -86,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - _log.warning("Null owner for castle: " + _castle.getName()); + LOGGER.warning("Null owner for castle: " + _castle.getName()); } } else @@ -139,7 +139,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - _log.warning("Null owner for siegable hall: " + _hall.getName()); + LOGGER.warning("Null owner for siegable hall: " + _hall.getName()); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index da3173200e..67dd91c8f1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -94,7 +94,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket if (player.getActiveWarehouse() == null) { // Something went wrong! - _log.warning("error while sending withdraw request to: " + player.getName()); + LOGGER.warning("error while sending withdraw request to: " + player.getName()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index aad71c7d6b..6e823f1de3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -43,7 +43,7 @@ public final class WareHouseWithdrawalList extends AbstractItemPacket { if (player.getActiveWarehouse() == null) { - _log.warning("error while sending withdraw request to: " + player.getName()); + LOGGER.warning("error while sending withdraw request to: " + player.getName()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/DateRange.java index 945a74689c..77abb2f414 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/DateRange.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; */ public class DateRange { - protected static final Logger _log = Logger.getLogger(DateRange.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(DateRange.class.getName()); private final Date _startDate, _endDate; public DateRange(Date from, Date to) @@ -47,7 +47,7 @@ public class DateRange } catch (ParseException e) { - _log.log(Level.WARNING, "Invalid Date Format.", e); + LOGGER.log(Level.WARNING, "Invalid Date Format.", e); } } return new DateRange(null, null); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/ScriptDocument.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/ScriptDocument.java index 92f0fcf6d1..0407240659 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/ScriptDocument.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/ScriptDocument.java @@ -32,7 +32,7 @@ import org.xml.sax.SAXException; */ public class ScriptDocument { - private static final Logger _log = Logger.getLogger(ScriptDocument.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScriptDocument.class.getName()); private Document _document; private final String _name; @@ -48,17 +48,17 @@ public class ScriptDocument } catch (SAXException sxe) { - _log.warning(getClass().getSimpleName() + ": " + (sxe.getException() != null ? sxe.getException() : sxe).getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + (sxe.getException() != null ? sxe.getException() : sxe).getMessage()); } catch (ParserConfigurationException pce) { // Parser with specified options can't be built - _log.log(Level.WARNING, "", pce); + LOGGER.log(Level.WARNING, "", pce); } catch (IOException ioe) { // I/O error - _log.log(Level.WARNING, "", ioe); + LOGGER.log(Level.WARNING, "", ioe); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 20ade3fd92..fd27cfb194 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SecondaryPasswordAuth { - private final Logger _log = Logger.getLogger(SecondaryPasswordAuth.class.getName()); + private final Logger LOGGER = Logger.getLogger(SecondaryPasswordAuth.class.getName()); private final L2GameClient _activeClient; private String _password; @@ -96,7 +96,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); } } @@ -104,7 +104,7 @@ public class SecondaryPasswordAuth { if (passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -127,7 +127,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing password.", e); + LOGGER.log(Level.SEVERE, "Error while writing password.", e); return false; } _password = password; @@ -147,7 +147,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing wrong attempts.", e); + LOGGER.log(Level.SEVERE, "Error while writing wrong attempts.", e); return false; } return true; @@ -157,7 +157,7 @@ public class SecondaryPasswordAuth { if (!passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -185,7 +185,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); return false; } @@ -210,7 +210,7 @@ public class SecondaryPasswordAuth { LoginServerThread.getInstance().sendTempBan(_activeClient.getAccountName(), _activeClient.getConnectionAddress().getHostAddress(), SecondaryAuthData.getInstance().getBanTime()); LoginServerThread.getInstance().sendMail(_activeClient.getAccountName(), "SATempBan", _activeClient.getConnectionAddress().getHostAddress(), Integer.toString(SecondaryAuthData.getInstance().getMaxAttempts()), Long.toString(SecondaryAuthData.getInstance().getBanTime()), SecondaryAuthData.getInstance().getRecoveryLink()); - _log.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); + LOGGER.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); insertWrongAttempt(0); _activeClient.close(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_BAN, SecondaryAuthData.getInstance().getMaxAttempts())); } @@ -258,11 +258,11 @@ public class SecondaryPasswordAuth } catch (NoSuchAlgorithmException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); } catch (UnsupportedEncodingException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Encoding"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Encoding"); } return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index 34f1874927..d22090cce0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; */ public class AttackStanceTaskManager { - protected static final Logger _log = Logger.getLogger(AttackStanceTaskManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AttackStanceTaskManager.class.getName()); protected static final Map _attackStanceTasks = new ConcurrentHashMap<>(); @@ -138,7 +138,7 @@ public class AttackStanceTaskManager catch (Exception e) { // Unless caught here, players remain in attack positions. - _log.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Broadcast.java index 9a914d84a0..38fe478192 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Broadcast.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.RelationChanged; */ public final class Broadcast { - private static Logger _log = Logger.getLogger(Broadcast.class.getName()); + private static Logger LOGGER = Logger.getLogger(Broadcast.class.getName()); /** * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character that have the Character targeted.
@@ -89,7 +89,7 @@ public final class Broadcast } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } }); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Evolve.java index ac9754a79d..ac806a3947 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Evolve.java @@ -45,7 +45,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class Evolve { - protected static final Logger _log = Logger.getLogger(Evolve.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Evolve.class.getName()); public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) { @@ -291,7 +291,7 @@ public final class Evolve } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } @@ -318,7 +318,7 @@ public final class Evolve } catch (Throwable e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java index 2cda57afed..6c0873949f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -40,7 +40,7 @@ public final class FloodProtectorAction /** * Logger */ - private static final Logger _log = Logger.getLogger(FloodProtectorAction.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectorAction.class.getName()); /** * Client for this instance of flood protector. */ @@ -94,7 +94,7 @@ public final class FloodProtectorAction if ((curTick < _nextGameTick) || _punishmentInProgress) { - if (_config.LOG_FLOODING && !_logged && _log.isLoggable(Level.WARNING)) + if (_config.LOG_FLOODING && !_logged && LOGGER.isLoggable(Level.WARNING)) { log(" called command ", command, " ~", String.valueOf((_config.FLOOD_PROTECTION_INTERVAL - (_nextGameTick - curTick)) * GameTimeController.MILLIS_IN_TICK), " ms after previous command"); _logged = true; @@ -124,7 +124,7 @@ public final class FloodProtectorAction return false; } - if ((_count.get() > 0) && _config.LOG_FLOODING && _log.isLoggable(Level.WARNING)) + if ((_count.get() > 0) && _config.LOG_FLOODING && LOGGER.isLoggable(Level.WARNING)) { log(" issued ", String.valueOf(_count), " extra requests within ~", String.valueOf(_config.FLOOD_PROTECTION_INTERVAL * GameTimeController.MILLIS_IN_TICK), " ms"); } @@ -142,7 +142,7 @@ public final class FloodProtectorAction { Disconnection.of(_client).defaultSequence(false); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log("kicked for flooding"); } @@ -154,7 +154,7 @@ public final class FloodProtectorAction private void banAccount() { PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -176,7 +176,7 @@ public final class FloodProtectorAction PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" jailed for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -238,6 +238,6 @@ public final class FloodProtectorAction Arrays.stream(lines).forEach(output::append); - _log.warning(output.toString()); + LOGGER.warning(output.toString()); } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/GMAudit.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/GMAudit.java index e2d84c5f8b..a17dea91a0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/GMAudit.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/GMAudit.java @@ -31,7 +31,7 @@ import com.l2jmobius.Config; */ public class GMAudit { - private static final Logger _log = Logger.getLogger(GMAudit.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GMAudit.class.getName()); static { new File("log/GMAudit").mkdirs(); @@ -61,7 +61,7 @@ public class GMAudit } catch (IOException e) { - _log.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); + LOGGER.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 492c2c6f83..3cb8fafc7b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public final class OfflineTradeUtil { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private OfflineTradeUtil() { @@ -139,7 +139,7 @@ public final class OfflineTradeUtil } Disconnection.of(player).storeMe().close(false); - LOG_ACCOUNTING.info("Entering offline mode, " + client); + LOGGER_ACCOUNTING.info("Entering offline mode, " + client); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/FloodProtectedListener.java index 46a4f2d6b5..af74df96e9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import com.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger _log = Logger.getLogger(FloodProtectedListener.class.getName()); + private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map _floodProtection = new ConcurrentHashMap<>(); private ServerSocket _serverSocket; @@ -70,7 +70,7 @@ public abstract class FloodProtectedListener extends Thread fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) { - _log.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); + LOGGER.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); } fConnection.isFlooding = true; continue; @@ -78,7 +78,7 @@ public abstract class FloodProtectedListener extends Thread if (fConnection.isFlooding) // if connection was flooding server but now passed the check { fConnection.isFlooding = false; - _log.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); + LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } fConnection.lastConnection = System.currentTimeMillis(); } @@ -102,7 +102,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException io) { - _log.log(Level.INFO, "", io); + LOGGER.log(Level.INFO, "", io); } break; } @@ -145,7 +145,7 @@ public abstract class FloodProtectedListener extends Thread } else { - _log.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); + LOGGER.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); } } @@ -157,7 +157,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java index b696b2b30c..5cc887dbad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters; */ public class GameServerThread extends Thread { - protected static final Logger _log = Logger.getLogger(GameServerThread.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GameServerThread.class.getName()); private final Socket _connection; private InputStream _in; private OutputStream _out; @@ -69,7 +69,7 @@ public class GameServerThread extends Thread _connectionIPAddress = _connection.getInetAddress().getHostAddress(); if (GameServerThread.isBannedGameserverIP(_connectionIPAddress)) { - _log.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); + LOGGER.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); forceClose(LoginServerFail.REASON_IP_BANNED); // ensure no further processing for this connection return; @@ -92,7 +92,7 @@ public class GameServerThread extends Thread if ((lengthHi < 0) || _connection.isClosed()) { - _log.finer("LoginServerThread: Login terminated the connection."); + LOGGER.finer("LoginServerThread: Login terminated the connection."); break; } @@ -110,7 +110,7 @@ public class GameServerThread extends Thread if (receivedBytes != (length - 2)) { - _log.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); + LOGGER.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); break; } @@ -119,7 +119,7 @@ public class GameServerThread extends Thread checksumOk = NewCrypt.verifyChecksum(data); if (!checksumOk) { - _log.warning("Incorrect packet checksum, closing connection (LS)"); + LOGGER.warning("Incorrect packet checksum, closing connection (LS)"); return; } @@ -130,14 +130,14 @@ public class GameServerThread extends Thread { final String serverName = getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"; final String msg = "GameServer " + serverName + ": Connection lost: " + e.getMessage(); - _log.info(msg); + LOGGER.info(msg); } finally { if (isAuthed()) { _gsi.setDown(); - _log.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); + LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); @@ -185,7 +185,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); + LOGGER.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); } } @@ -209,7 +209,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final ScrambledKeyPair pair = LoginController.getInstance().getScrambledRSAKeyPair(); _privateKey = (RSAPrivateKey) pair.getPrivateKey(); @@ -241,7 +241,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.severe("IOException while sending packet " + sl.getClass().getSimpleName()); + LOGGER.severe("IOException while sending packet " + sl.getClass().getSimpleName()); } } @@ -265,7 +265,7 @@ public class GameServerThread extends Thread */ public void setGameHosts(String[] hosts) { - _log.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); + LOGGER.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); _gsi.clearServerAddresses(); for (int i = 0; i < hosts.length; i += 2) @@ -276,13 +276,13 @@ public class GameServerThread extends Thread } catch (Exception e) { - _log.warning("Couldn't resolve hostname \"" + e + "\""); + LOGGER.warning("Couldn't resolve hostname \"" + e + "\""); } } for (String s : _gsi.getServerAddresses()) { - _log.info(s); + LOGGER.info(s); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/L2LoginServer.java index 0032232b4d..4c3aed9bdb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/L2LoginServer.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; */ public final class L2LoginServer { - private final Logger _log = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; private static L2LoginServer _instance; @@ -77,7 +77,7 @@ public final class L2LoginServer } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Load Config @@ -92,7 +92,7 @@ public final class L2LoginServer } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); System.exit(1); } @@ -104,11 +104,11 @@ public final class L2LoginServer { _gameServerListener = new GameServerListener(); _gameServerListener.start(); - _log.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); + LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); } catch (IOException e) { - _log.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); System.exit(1); } @@ -148,7 +148,7 @@ public final class L2LoginServer } catch (NumberFormatException nfe) { - _log.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); return; } } @@ -159,25 +159,25 @@ public final class L2LoginServer } catch (UnknownHostException e) { - _log.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); } }); //@formatter:on } catch (IOException e) { - _log.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); } - _log.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); + LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); } else { - _log.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); + LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); } if (Config.LOGIN_SERVER_SCHEDULE_RESTART) { - _log.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); + LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); _restartLoginServer = new LoginServerRestart(); _restartLoginServer.setDaemon(true); _restartLoginServer.start(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginController.java index 2c74029deb..47fb44a496 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginController.java @@ -51,7 +51,7 @@ import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason public class LoginController { - protected static final Logger _log = Logger.getLogger(LoginController.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(LoginController.class.getName()); private static LoginController _instance; @@ -78,7 +78,7 @@ public class LoginController private LoginController() throws GeneralSecurityException { - _log.info("Loading LoginController..."); + LOGGER.info("Loading LoginController..."); _keyPairs = new ScrambledKeyPair[10]; _blowfishKeyGenerator = KeyGenerator.getInstance("Blowfish"); @@ -91,7 +91,7 @@ public class LoginController _keyPairs[i] = new ScrambledKeyPair(rsaKeyPairGenerator.generateKeyPair()); } - _log.info("Cached 10 KeyPairs for RSA communication."); + LOGGER.info("Cached 10 KeyPairs for RSA communication."); final Thread purge = new PurgeThread(); purge.setDaemon(true); @@ -156,7 +156,7 @@ public class LoginController addBanForAddress(addr, Config.LOGIN_BLOCK_AFTER_BAN * 1000); // we need to clear the failed login attempts here, so after the ip ban is over the client has another 5 attempts clearFailedLoginAttemps(addr); - _log.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); + LOGGER.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); } } @@ -218,16 +218,16 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); return null; } - _log.info("Auto created account '" + login + "'."); + LOGGER.info("Auto created account '" + login + "'."); return retriveAccountInfo(addr, login, password, false); } catch (Exception e) { - _log.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); return null; } } @@ -301,7 +301,7 @@ public class LoginController if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); - _log.info("Removed expired ip address ban " + address.getHostAddress() + "."); + LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); return false; } return true; @@ -414,7 +414,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); } } return loginOk; @@ -433,7 +433,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); } } @@ -452,7 +452,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); } } @@ -532,13 +532,13 @@ public class LoginController { if (!ipWhiteList.isEmpty() && !ipWhiteList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); return false; } if (!ipBlackList.isEmpty() && ipBlackList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); return false; } } @@ -558,7 +558,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not finish login process!", e); + LOGGER.log(Level.WARNING, "Could not finish login process!", e); return false; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java index e1d9661f62..f24bd147fa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class L2JGameServerPacketHandler { - protected static Logger _log = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); + protected static Logger LOGGER = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); public enum GameServerState { @@ -65,7 +65,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -83,7 +83,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -146,7 +146,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java index 2319fe24aa..ca59943897 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -46,7 +46,7 @@ import io.netty.channel.ChannelHandlerContext; */ public final class L2LoginClient extends ChannelInboundHandler { - private static final Logger _log = Logger.getLogger(L2LoginClient.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2LoginClient.class.getName()); // Crypt private final ScrambledKeyPair _scrambledPair; @@ -105,7 +105,7 @@ public final class L2LoginClient extends ChannelInboundHandler } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java index 887dbec337..2f9f7fbb7f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java @@ -46,7 +46,7 @@ import com.l2jmobius.loginserver.network.serverpackets.ServerList; */ public class RequestAuthLogin implements IIncomingPacket { - private static Logger _log = Logger.getLogger(RequestAuthLogin.class.getName()); + private static Logger LOGGER = Logger.getLogger(RequestAuthLogin.class.getName()); private final byte[] _raw1 = new byte[128]; private final byte[] _raw2 = new byte[128]; @@ -89,7 +89,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (GeneralSecurityException e) { - _log.log(Level.INFO, "", e); + LOGGER.log(Level.INFO, "", e); return; } @@ -108,7 +108,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java index 2d97271178..d13a3c9d2e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java @@ -32,7 +32,7 @@ import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerSt */ public class BlowFishKey extends BaseRecievePacket { - protected static final Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param decrypt @@ -67,7 +67,7 @@ public class BlowFishKey extends BaseRecievePacket } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java index aaee954e11..82741d5347 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java @@ -27,7 +27,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class ChangeAccessLevel extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangeAccessLevel.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangeAccessLevel.class.getName()); /** * @param decrypt @@ -40,6 +40,6 @@ public class ChangeAccessLevel extends BaseRecievePacket final String account = readS(); LoginController.getInstance().setAccountAccessLevel(account, level); - _log.info("Changed " + account + " access level to " + level); + LOGGER.info("Changed " + account + " access level to " + level); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java index bb294110aa..ed7420dda3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java @@ -35,7 +35,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ChangePassword extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangePassword.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangePassword.class.getName()); private static GameServerThread gst = null; public ChangePassword(byte[] decrypt) @@ -103,7 +103,7 @@ public class ChangePassword extends BaseRecievePacket passUpdated = ps.executeUpdate(); } - _log.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); + LOGGER.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); if (passUpdated > 0) { gst.ChangePasswordResponse((byte) 1, characterName, "You have successfully changed your password!"); @@ -120,7 +120,7 @@ public class ChangePassword extends BaseRecievePacket } catch (Exception e) { - _log.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); + LOGGER.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java index 1718daa41c..b6055064f6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class GameServerAuth extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(GameServerAuth.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GameServerAuth.class.getName()); GameServerThread _server; private final byte[] _hexId; private final int _desiredId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java index f78a26f14d..fcdb28f498 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerLogout extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerLogout.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerLogout.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java index a953fbf9ed..dbf8e76b2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class PlayerTracert extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerTracert.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerTracert.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java index 20c9c912b9..6786f79cf6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java @@ -31,7 +31,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class RequestTempBan extends BaseRecievePacket { - private static final Logger _log = Logger.getLogger(RequestTempBan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RequestTempBan.class.getName()); private final String _accountName; @SuppressWarnings("unused") @@ -69,7 +69,7 @@ public class RequestTempBan extends BaseRecievePacket } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } try diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java index c26a3a919e..2916b90b2e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java @@ -28,7 +28,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ServerStatus extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ServerStatus.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ServerStatus.class.getName()); public static final int SERVER_LIST_STATUS = 0x01; public static final int SERVER_TYPE = 0x02; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java index acbbe42acf..5757078e73 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -61,7 +61,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; */ public final class ServerList implements IOutgoingPacket { - protected static final Logger _log = Logger.getLogger(ServerList.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ServerList.class.getName()); private final List _servers; private final int _lastServer; @@ -90,7 +90,7 @@ public final class ServerList implements IOutgoingPacket } catch (UnknownHostException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); _ip = new byte[4]; _ip[0] = 127; _ip[1] = 0; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java index f80bd19c26..9ef7939eb3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; */ public class IPv4Filter implements Runnable { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final HashMap _ipFloodMap; private static final long SLEEP_TIME = 5000; @@ -69,7 +69,7 @@ public class IPv4Filter implements Runnable final InetAddress addr = sc.socket().getInetAddress(); if (!(addr instanceof Inet4Address)) { - _log.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); + LOGGER.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/AbstractNpcAI.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/AbstractNpcAI.java index df220882f6..5163520584 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/AbstractNpcAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/AbstractNpcAI.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public abstract class AbstractNpcAI extends Quest { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); public AbstractNpcAI() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 1f39611ed2..bd2ea79b44 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -628,7 +628,7 @@ public final class Antharas extends AbstractNpcAI { if (!zone.isCharacterInZone(attacker) || (getStatus() != IN_FIGHT)) { - _log.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); attacker.teleToLocation(80464, 152294, -3534); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index c4cec24dce..f4589101b0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1245,7 +1245,7 @@ public final class CastleChamberlain extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 6c1d0c7c68..3e8e690ed0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -60,7 +60,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler "watchmatch", "arenachange" }; - private static final Logger _LOG = Logger.getLogger(OlyManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlyManager.class.getName()); private OlyManager() { @@ -351,7 +351,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler final List spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns(); if (spectatorSpawns.isEmpty()) { - _LOG.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); + LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); @@ -362,7 +362,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler } catch (Exception e) { - _LOG.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 4ca3d1df97..813358bd0c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -88,7 +88,7 @@ public final class Elpies extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started because custom NPC table is disabled!"); + LOGGER.info(getName() + ": Event can't be started because custom NPC table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index e8d253c2c9..bd418adefc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -95,7 +95,7 @@ public final class Rabbits extends Event // Check starting conditions if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPCs are disabled!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java index 19f2f42bae..7756d0d55e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java @@ -121,7 +121,7 @@ public final class Race extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom npc table is disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom npc table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/listeners/ListenerTest.java index 73b858e854..59dcb31683 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -63,7 +63,7 @@ public class ListenerTest extends AbstractNpcAI // Manual listener registration Containers.Global().addListener(new ConsumerEventListener(Containers.Global(), EventType.ON_PLAYER_DLG_ANSWER, (OnPlayerDlgAnswer event) -> { - _log.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); }, this)); } @@ -73,7 +73,7 @@ public class ListenerTest extends AbstractNpcAI */ private void onAttackableAttack(OnAttackableAttack event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); } /** @@ -88,7 +88,7 @@ public class ListenerTest extends AbstractNpcAI @Id(22228) private void onCreatureKill(OnCreatureDeath event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); } /** @@ -101,7 +101,7 @@ public class ListenerTest extends AbstractNpcAI @Range(from = 1, to = 9) private void onSiegeStart(OnCastleSiegeStart event) { - _log.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); + LOGGER.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); } /** @@ -114,7 +114,7 @@ public class ListenerTest extends AbstractNpcAI @Id(5575) private void onItemCreate(OnItemCreate event) { - _log.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); + LOGGER.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); } /** @@ -152,7 +152,7 @@ public class ListenerTest extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void OnPlayerLogin(OnPlayerLogin event) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); } /** @@ -170,7 +170,7 @@ public class ListenerTest extends AbstractNpcAI { if (event.getTarget().isGM()) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); return new TerminateReturn(true, true, true); } return null; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java index 9afcf3bb83..0e053d06ac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java @@ -341,7 +341,7 @@ import handlers.voicedcommandhandlers.StatsVCmd; */ public class MasterHandler { - private static final Logger _log = Logger.getLogger(MasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MasterHandler.class.getName()); private static final IHandler[] LOAD_INSTANCES = { @@ -680,7 +680,7 @@ public class MasterHandler public static void main(String[] args) { - _log.info("Loading Handlers..."); + LOGGER.info("Loading Handlers..."); final Map, Method> registerHandlerMethods = new HashMap<>(); for (IHandler loadInstance : LOAD_INSTANCES) @@ -697,7 +697,7 @@ public class MasterHandler registerHandlerMethods.entrySet().stream().filter(e -> e.getValue() == null).forEach(e -> { - _log.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); + LOGGER.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); }); for (Class classes[] : HANDLERS) @@ -722,7 +722,7 @@ public class MasterHandler } catch (Exception e) { - _log.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); + LOGGER.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); continue; } } @@ -759,9 +759,9 @@ public class MasterHandler for (IHandler loadInstance : LOAD_INSTANCES) { - _log.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); + LOGGER.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); } - _log.info("Handlers Loaded..."); + LOGGER.info("Handlers Loaded..."); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java index 2c0368fa04..6239aa2af9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java @@ -34,7 +34,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target; if (staticObject.getType() < 0) { - _log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); + LOGGER.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); } // Check if the L2PcInstance already target the L2NpcInstance diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7b78de63fe..1ead5e9548 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminAdmin implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminAdmin.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminAdmin.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -121,7 +121,7 @@ public class AdminAdmin implements IAdminCommandHandler } catch (Exception e) { - _log.warning("An error occured while ending olympiad: " + e); + LOGGER.warning("An error occured while ending olympiad: " + e); } activeChar.sendMessage("Heroes formed."); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 3eaefdfc12..064f1c9519 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.UserInfo; */ public class AdminEditChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEditChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEditChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -218,7 +218,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set reputation error: " + e); + LOGGER.warning("Set reputation error: " + e); } activeChar.sendMessage("Usage: //setreputation "); } @@ -261,7 +261,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pk error: " + e); + LOGGER.warning("Set pk error: " + e); } activeChar.sendMessage("Usage: //setpk "); } @@ -291,7 +291,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pvp error: " + e); + LOGGER.warning("Set pvp error: " + e); } activeChar.sendMessage("Usage: //setpvp "); } @@ -321,7 +321,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set Fame error: " + e); + LOGGER.warning("Set Fame error: " + e); } activeChar.sendMessage("Usage: //setfame "); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 1634710c12..2de1bf7bd5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; */ public class AdminEnchant implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEnchant.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEnchant.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -146,7 +146,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a new enchant value."); } @@ -154,7 +154,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a valid new enchant value."); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index 5acf20c5b6..1da9a18c9d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminHeal implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_heal" @@ -57,7 +57,7 @@ public class AdminHeal implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Heal error: " + e); + LOGGER.warning("Heal error: " + e); } activeChar.sendMessage("Incorrect target/radius specified."); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index 549035d177..5ab19d4b39 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminMenu implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminMenu.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminMenu.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -112,7 +112,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_recall_clan_menu")) @@ -141,7 +141,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_goto_char_menu")) @@ -190,7 +190,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -207,7 +207,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5b95022983..cd89f2cc84 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminPunishment implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPunishment.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPunishment.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -86,7 +86,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); } } else @@ -149,7 +149,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); } break; } @@ -186,7 +186,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java index 934e877d84..764ab77c25 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminRepairChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRepairChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRepairChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -101,7 +101,7 @@ public class AdminRepairChar implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "could not repair char:", e); + LOGGER.log(Level.WARNING, "could not repair char:", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java index dfd8ab322b..52c768b06a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList; */ public class AdminShop implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShop.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShop.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -106,7 +106,7 @@ public class AdminShop implements IAdminCommandHandler } catch (Exception e) { - _log.warning("admin buylist failed:" + command); + LOGGER.warning("admin buylist failed:" + command); } final ProductList buyList = BuyListData.getInstance().getBuyList(val); @@ -117,7 +117,7 @@ public class AdminShop implements IAdminCommandHandler } else { - _log.warning("no buylist with id:" + val); + LOGGER.warning("no buylist with id:" + val); activeChar.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index a569d1fca6..780c3b0088 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.QuestList; */ public class AdminShowQuests implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShowQuests.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShowQuests.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -313,7 +313,7 @@ public class AdminShowQuests implements IAdminCommandHandler catch (Exception e) { actor.sendMessage("There was an error."); - _log.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java index ea51fdd106..93293c80e2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class AdminSkill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminSkill.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -526,7 +526,7 @@ public class AdminSkill implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } if (skill != null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java index bf52975d48..603c953427 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class AdminSpawn implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSpawn.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -377,17 +377,17 @@ public class AdminSpawn implements IAdminCommandHandler default: case 0: { - _log.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); + LOGGER.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); break; } case 1: { - _log.info(""); + LOGGER.info(""); break; } case 2: { - _log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); + LOGGER.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java index 880aba40c1..a818e7f3d3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminSummon implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSummon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName()); public static final String[] ADMIN_COMMANDS = { @@ -69,7 +69,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -81,7 +81,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index a088b5f7f0..27bcfe9dd8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -50,7 +50,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminTeleport implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminTeleport.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminTeleport.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -525,7 +525,7 @@ public class AdminTeleport implements IAdminCommandHandler if (template1 == null) { activeChar.sendMessage("Incorrect monster template."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); return; } @@ -533,7 +533,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect monster spawn."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); return; } final int respawnTime = spawn.getRespawnDelay() / 1000; @@ -575,7 +575,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect raid spawn."); - _log.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); return; } DBSpawnManager.getInstance().deleteSpawn(spawn, true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java index a02258ac82..6661cf897c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminUnblockIp implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminUnblockIp.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminUnblockIp.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -68,7 +68,7 @@ public class AdminUnblockIp implements IAdminCommandHandler private boolean unblockIp(String ipAddress, L2PcInstance activeChar) { // LoginServerThread.getInstance().unBlockip(ipAddress); - _log.warning("IP removed by GM " + activeChar.getName()); + LOGGER.warning("IP removed by GM " + activeChar.getName()); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index d5baa52a73..fd68914b26 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -64,7 +64,7 @@ import ai.AbstractNpcAI; */ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPathNode.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPathNode.class.getName()); private final Map _zones = new ConcurrentHashMap<>(); private static final String[] COMMANDS = @@ -484,7 +484,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler catch (Exception e) { activeChar.sendMessage("Failed writing the dump: " + e.getMessage()); - _log.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Augment.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Augment.java index 6f3cdd671a..015cb20ce8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Augment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Augment.java @@ -57,7 +57,7 @@ public class Augment implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Buy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Buy.java index dedd804298..5084dc1239 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Buy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Buy.java @@ -54,7 +54,7 @@ public class Buy implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 77244e8a99..b937970ce0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -112,7 +112,7 @@ public class ClanWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } } return false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 383b2ac65a..648a840357 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -54,7 +54,7 @@ public class EventEngine implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 5bb42fb02d..2cc2c9cd2e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -121,7 +121,7 @@ public class ItemAuctionLink implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 1ee7660160..fc06d1b5ea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -35,13 +35,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty link html!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - _log.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java index 15c9a87b30..bd019c6c2b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java @@ -59,7 +59,7 @@ public class Multisell implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 27bbae841c..8d2b77c311 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -62,7 +62,7 @@ public class NpcViewMod implements IBypassHandler if (!st.hasMoreTokens()) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -101,7 +101,7 @@ public class NpcViewMod implements IBypassHandler { if (st.countTokens() < 2) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -124,7 +124,7 @@ public class NpcViewMod implements IBypassHandler } catch (IllegalArgumentException e) { - _log.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); + LOGGER.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); return false; } break; @@ -571,7 +571,7 @@ public class NpcViewMod implements IBypassHandler String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/DropList.htm"); if (html == null) { - _log.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); + LOGGER.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); return; } html = html.replaceAll("%name%", npc.getName()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 49825fbf68..9b177fff8d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -113,7 +113,7 @@ public class Observation implements IBypassHandler } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java index 6c16720329..0597ff6ab7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java @@ -66,7 +66,7 @@ public class PlayerHelp implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index d6c31d5495..59491ae669 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -67,7 +67,7 @@ public class PrivateWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 40de431ce5..fd1fe934bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -63,7 +63,7 @@ public class Wear implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } @@ -73,7 +73,7 @@ public class Wear implements IBypassHandler final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index faa4b3ef97..d74fd3a648 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -39,7 +39,7 @@ public final class AttackTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": this effect must have parameters!"); + LOGGER.warning(getClass().getSimpleName() + ": this effect must have parameters!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 675e1023d2..3b0c1fb514 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -74,7 +74,7 @@ public final class CallSkill extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 924b08d8f7..b582a0e29e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -66,7 +66,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } return skill.isToggle(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 36bed01887..9b3af7d06a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -39,7 +39,7 @@ public final class DefenceTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); return; } @@ -57,11 +57,11 @@ public final class DefenceTrait extends AbstractEffect } catch (NumberFormatException e) { - _log.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); + LOGGER.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); + LOGGER.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index b6d50cd89c..8fb26ea974 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -48,7 +48,7 @@ public final class Disarmor extends AbstractEffect _slot = ItemTable.SLOTS.getOrDefault(slot, L2Item.SLOT_NONE); if (_slot == L2Item.SLOT_NONE) { - _log.severe("Unknown bodypart slot for effect: " + slot); + LOGGER.severe("Unknown bodypart slot for effect: " + slot); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index adf474fe77..dbc72f8b13 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -59,7 +59,7 @@ public final class Restoration extends AbstractEffect if ((_itemId <= 0) || (_itemCount <= 0)) { effected.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE); - _log.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); + LOGGER.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java index f9a102f869..edcd13b407 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -97,7 +97,7 @@ public final class Summon extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 0fab6deaee..c73eb71458 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -38,7 +38,7 @@ public final class SummonAgathion extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); } _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7ad2935324..d745528a40 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -64,7 +64,7 @@ public final class SummonCubic extends AbstractEffect if (_cubicId < 0) { - _log.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index b10d5cb341..d88f72ee89 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -66,7 +66,7 @@ public class SummonHallucination extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -79,7 +79,7 @@ public class SummonHallucination extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 03d7f27857..15c94c90a2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -87,7 +87,7 @@ public final class SummonMulti extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index ae4549f39f..5779663ae6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -80,7 +80,7 @@ public final class SummonNpc extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -93,7 +93,7 @@ public final class SummonNpc extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } @@ -162,7 +162,7 @@ public final class SummonNpc extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); + LOGGER.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5d8b92393c..a771a8e4cc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -75,14 +75,14 @@ public final class SummonPet extends AbstractEffect final PetItemHolder holder = player.removeScript(PetItemHolder.class); if (holder == null) { - _log.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); + LOGGER.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); return; } final L2ItemInstance collar = holder.getItem(); if (player.getInventory().getItemByObjectId(collar.getObjectId()) != collar) { - _log.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); + LOGGER.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 4528a3f91b..984c53a5ab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -57,7 +57,7 @@ public final class SummonTrap extends AbstractEffect if (_npcId <= 0) { - _log.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); return; } @@ -76,7 +76,7 @@ public final class SummonTrap extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index c3a9b08bde..8d18d6fecc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -110,7 +110,7 @@ public final class Synergy extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 32ac16aa59..da879def26 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -146,7 +146,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index c9ce6cc000..b7d80e1e34 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -64,7 +64,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -81,7 +81,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 351e687f0f..2ce0c6758c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -88,7 +88,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c950983e3d..1c010ed094 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -91,7 +91,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 7a474f5b8d..956ef40eed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -102,7 +102,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index fefd166e0d..014142ca85 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -114,7 +114,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 23a72039a7..1f0c32d50d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -97,7 +97,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -124,7 +124,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 9c5277f5f4..c01713088c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -90,7 +90,7 @@ public class BeastSoulShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index ac1c881ba5..92a3a94e76 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -92,7 +92,7 @@ public class BeastSpiritShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index a053b95a9d..e3b723050d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -52,7 +52,7 @@ public class BlessedSoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9800a7e664..52f772757a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -48,7 +48,7 @@ public class BlessedSpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index e7c5629cc7..e1df0bdc7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -59,7 +59,7 @@ public class EventItem implements IItemHandler } default: { - _log.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); + LOGGER.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); } } return used; @@ -103,7 +103,7 @@ public class EventItem implements IItemHandler }); return true; } - _log.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); + LOGGER.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index e70baa0351..fa4e40f0b5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -54,7 +54,7 @@ public class ExtractableItems implements IItemHandler final List exitems = etcitem.getExtractableItems(); if (exitems == null) { - _log.info("No extractable data defined for " + etcitem); + LOGGER.info("No extractable data defined for " + etcitem); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 5c5598ea69..ac21e53795 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -84,7 +84,7 @@ public class FishShots implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 4773bde656..59fe8bc737 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -51,7 +51,7 @@ public final class Harvester implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 5578595da8..61b2045490 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -61,7 +61,7 @@ public class ItemSkillsTemplate implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.info("Item " + item + " does not have registered any skill for handler."); + LOGGER.info("Item " + item + " does not have registered any skill for handler."); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 05c1ac3f7d..d3ffb95e30 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -49,7 +49,7 @@ public class SoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index ddf0402d2b..87f06565c2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -48,7 +48,7 @@ public class SpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java index 7144892fa5..59ecba44bb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ClanWarsList implements IUserCommandHandler { - private static final Logger _log = Logger.getLogger(ClanWarsList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanWarsList.class.getName()); private static final int[] COMMAND_IDS = { 88, @@ -119,7 +119,7 @@ public class ClanWarsList implements IUserCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java index 7dced5f20e..5e98fa04f5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - _log.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); return; } @@ -133,7 +133,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // When nobody can enter if (enterGroup == null) { - _log.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); + LOGGER.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); return; } @@ -214,7 +214,7 @@ public abstract class AbstractInstance extends AbstractNpcAI } else { - _log.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); + LOGGER.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/QuestMasterHandler.java index b213c93faf..12172b950b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/QuestMasterHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/QuestMasterHandler.java @@ -188,7 +188,7 @@ import quests.Q11000_MoonKnight.Q11000_MoonKnight; */ public class QuestMasterHandler { - private static final Logger _log = Logger.getLogger(QuestMasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(QuestMasterHandler.class.getName()); private static final Class[] QUESTS = { @@ -367,7 +367,7 @@ public class QuestMasterHandler } catch (Exception e) { - _log.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); + LOGGER.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseRecievePacket.java index b8e2b08f14..33146d6d53 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseRecievePacket.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public abstract class BaseRecievePacket { - private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseRecievePacket.class.getName()); private final byte[] _decrypt; private int _off; @@ -78,7 +78,7 @@ public abstract class BaseRecievePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } return result; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseSendablePacket.java index 894ea357b0..c29adc3bce 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseSendablePacket.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; */ public abstract class BaseSendablePacket { - private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseSendablePacket.class.getName()); private final ByteArrayOutputStream _bao; @@ -78,7 +78,7 @@ public abstract class BaseSendablePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } _bao.write(0); @@ -93,7 +93,7 @@ public abstract class BaseSendablePacket } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java index a2f78c7c94..a11ea8c3b5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; public class ScrambledKeyPair { - private static Logger _log = Logger.getLogger(ScrambledKeyPair.class.getName()); + private static Logger LOGGER = Logger.getLogger(ScrambledKeyPair.class.getName()); public KeyPair _pair; public byte[] _scrambledModulus; @@ -66,7 +66,7 @@ public class ScrambledKeyPair { scrambledMod[0x40 + i] = (byte) (scrambledMod[0x40 + i] ^ scrambledMod[i]); } - _log.finer("Modulus was scrambled"); + LOGGER.finer("Modulus was scrambled"); return scrambledMod; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java index a4df772cc3..57a47cf456 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class ForumsBBSManager extends BaseBBSManager { - private static Logger _log = Logger.getLogger(ForumsBBSManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(ForumsBBSManager.class.getName()); private final List _table; private int _lastid = 1; @@ -51,7 +51,7 @@ public class ForumsBBSManager extends BaseBBSManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); } } @@ -61,7 +61,7 @@ public class ForumsBBSManager extends BaseBBSManager public void initRoot() { _table.forEach(f -> f.vload()); - _log.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java index 609f0858d5..4aa8b72edb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class CharNameTable { - private static Logger _log = Logger.getLogger(CharNameTable.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharNameTable.class.getName()); private final Map _chars = new ConcurrentHashMap<>(); private final Map _accessLevels = new ConcurrentHashMap<>(); @@ -114,7 +114,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); } if (id > 0) @@ -162,7 +162,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return null; // not found @@ -190,7 +190,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); } return result; } @@ -211,7 +211,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); } return 0; } @@ -232,7 +232,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -253,7 +253,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); } return 0; } @@ -274,7 +274,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -294,9 +294,9 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); } public static CharNameTable getInstance() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/DocumentBase.java index 37410b0b38..fde34c2bc6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/DocumentBase.java @@ -148,7 +148,7 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public abstract class DocumentBase { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final File _file; protected final Map _tables = new HashMap<>(); @@ -171,7 +171,7 @@ public abstract class DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Error loading file " + _file, e); + LOGGER.log(Level.SEVERE, "Error loading file " + _file, e); } return doc; } @@ -344,7 +344,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -361,7 +361,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -375,7 +375,7 @@ public abstract class DocumentBase return new ConditionLogicNot(parseCondition(n, template)); } } - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); return null; } @@ -900,7 +900,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1095,7 +1095,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1135,7 +1135,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); + LOGGER.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); } } cond = joinAnd(cond, new ConditionUsingItemType(mask)); @@ -1156,7 +1156,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); + LOGGER.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); } } cond = joinAnd(cond, new ConditionUsingSlotType(mask)); @@ -1192,7 +1192,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1222,7 +1222,7 @@ public abstract class DocumentBase } if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java index 4d3be938c9..c425e3360c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.LinkedList; import java.util.List; import java.util.logging.Level; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -43,6 +44,8 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public final class DocumentItem extends DocumentBase implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(DocumentItem.class.getName()); + private Item _currentItem = null; private final List _itemsInFile = new LinkedList<>(); @@ -92,7 +95,7 @@ public final class DocumentItem extends DocumentBase implements IGameXmlReader } catch (Exception e) { - _log.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); + LOGGER.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 6832094027..5343f17e51 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.util.MathUtil; */ public class GeoEngine { - protected static final Logger _log = Logger.getLogger(GeoEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GeoEngine.class.getName()); private final ABlock[][] _blocks; private final BlockNull _nullBlock; @@ -71,7 +71,7 @@ public class GeoEngine */ public GeoEngine() { - _log.info("GeoEngine: Initializing..."); + LOGGER.info("GeoEngine: Initializing..."); // initialize block container _blocks = new ABlock[GeoStructure.GEO_BLOCKS_X][GeoStructure.GEO_BLOCKS_Y]; @@ -105,7 +105,7 @@ public class GeoEngine } } - _log.info("GeoEngine: Loaded " + loaded + " geodata files."); + LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files."); // avoid wrong configs when no files are loaded if (loaded == 0) @@ -113,12 +113,12 @@ public class GeoEngine if (Config.PATHFINDING) { Config.PATHFINDING = false; - _log.info("GeoEngine: Forcing PathFinding setting to false."); + LOGGER.info("GeoEngine: Forcing PathFinding setting to false."); } if (Config.COORD_SYNCHRONIZE == 2) { Config.COORD_SYNCHRONIZE = -1; - _log.info("GeoEngine: Forcing CoordSynchronize setting to -1."); + LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); } } @@ -185,7 +185,7 @@ public class GeoEngine // check data consistency if (buffer.remaining() > 0) { - _log.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); + LOGGER.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); } // loading was successful @@ -194,8 +194,8 @@ public class GeoEngine catch (Exception e) { // an error occured while loading, load null blocks - _log.warning("GeoEngine: Error while loading " + filename + " region file."); - _log.warning(e.getMessage()); + LOGGER.warning("GeoEngine: Error while loading " + filename + " region file."); + LOGGER.warning(e.getMessage()); e.printStackTrace(); // replace whole region file with null blocks @@ -300,7 +300,7 @@ public class GeoEngine if (block == null) // null block check { // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) - // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // LOGGER.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java index ece8351c5e..b33b0292ac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java @@ -57,11 +57,11 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); + LOGGER.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); } } - _log.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); + LOGGER.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); } @Override @@ -109,7 +109,7 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); return null; } finally diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IActionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IActionHandler.java index c4addd7df5..3640b57f65 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IActionHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IActionHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionHandler { - Logger _log = Logger.getLogger(IActionHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java index 35c546715c..5c5b946828 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionShiftHandler { - Logger _log = Logger.getLogger(IActionShiftHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionShiftHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IBypassHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IBypassHandler.java index a5a6295386..626cdb2b17 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IBypassHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IBypassHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public interface IBypassHandler { - Logger _log = Logger.getLogger(IBypassHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IBypassHandler.class.getName()); /** * This is the worker method that is called when someone uses an bypass command. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IItemHandler.java index 2f3d043ad0..a2079cc4ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IItemHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public interface IItemHandler { - Logger _log = Logger.getLogger(IItemHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IItemHandler.class.getName()); /** * Launch task associated to the item. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java index 4030ad83de..0f9c7b0132 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentType; */ public interface IPunishmentHandler { - Logger _log = Logger.getLogger(IPunishmentHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IPunishmentHandler.class.getName()); void onStart(PunishmentTask task); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java index 72b8a7b21a..d1cb086c89 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IUserCommandHandler { - Logger _log = Logger.getLogger(IUserCommandHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IUserCommandHandler.class.getName()); /** * this is the worker method that is called when someone uses an admin command. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java index e16e1eb679..9712fd7b04 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -60,7 +60,7 @@ import com.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi */ public final class CommissionManager { - private static final Logger _log = Logger.getLogger(CommissionManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CommissionManager.class.getName()); private static final int INTERACTION_DISTANCE = 250; private static final int ITEMS_LIMIT_PER_REQUEST = 999; @@ -103,7 +103,7 @@ public final class CommissionManager final L2ItemInstance itemInstance = itemInstances.get(rs.getInt("item_object_id")); if (itemInstance == null) { - _log.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); + LOGGER.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); continue; } final CommissionItem commissionItem = new CommissionItem(commissionId, itemInstance, rs.getLong("price_per_unit"), rs.getTimestamp("start_time").toInstant(), rs.getByte("duration_in_days")); @@ -121,7 +121,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); } } @@ -270,7 +270,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); player.sendPacket(SystemMessageId.THE_ITEM_HAS_FAILED_TO_BE_REGISTERED); player.sendPacket(ExResponseCommissionRegister.FAILED); } @@ -409,7 +409,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java index 7f4c6abd61..f635c19883 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class FactionManager { - private static Logger _log = Logger.getLogger(FactionManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(FactionManager.class.getName()); private final Map _playerFactions = new ConcurrentHashMap<>(); protected FactionManager() @@ -57,9 +57,9 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); } public final int getFactionByCharId(int id) @@ -91,7 +91,7 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return 0; // not found diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index b0fdfdf390..dc63278e16 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.entity.Fort; public final class FortManager implements InstanceListManager { - protected static final Logger _log = Logger.getLogger(FortManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); private final Map _forts = new ConcurrentSkipListMap<>(); @@ -131,7 +131,7 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - _log.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); for (Fort fort : getForts()) { fort.getSiege().loadSiegeGuard(); @@ -139,7 +139,7 @@ public final class FortManager implements InstanceListManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index aa7e2d3153..0a5245dafc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class FortSiegeManager { - private static final Logger _log = Logger.getLogger(FortSiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FortSiegeManager.class.getName()); private int _attackerMaxClans = 500; // Max number of clans @@ -101,7 +101,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -122,7 +122,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); + LOGGER.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); } // Siege setting @@ -163,7 +163,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading commander(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading commander(s) for " + fort.getName() + " fort."); } } @@ -189,7 +189,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading flag(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading flag(s) for " + fort.getName() + " fort."); } } _flagList.put(fort.getResidenceId(), _flagSpawns); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index 14f412ec48..338620a64f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; public final class GraciaSeedsManager { - private static final Logger _log = Logger.getLogger(GraciaSeedsManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GraciaSeedsManager.class.getName()); public static String ENERGY_SEEDS = "EnergySeeds"; @@ -70,7 +70,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); + LOGGER.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); break; } } @@ -124,7 +124,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); + LOGGER.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); } } } @@ -134,7 +134,7 @@ public final class GraciaSeedsManager final Quest quest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (quest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -155,7 +155,7 @@ public final class GraciaSeedsManager final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (esQuest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -171,7 +171,7 @@ public final class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { - _log.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); + LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 9c43355936..0a62e46364 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -47,7 +47,7 @@ public final class GrandBossManager implements IStorable private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?"; private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?"; - protected static Logger _log = Logger.getLogger(GrandBossManager.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GrandBossManager.class.getName()); protected static Map _bosses = new ConcurrentHashMap<>(); @@ -83,26 +83,26 @@ public final class GrandBossManager implements IStorable final int status = rs.getInt("status"); _bossStatus.put(bossId, status); _storedInfo.put(bossId, info); - _log.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); + LOGGER.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); if (status > 0) { - _log.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); + LOGGER.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); } } else { - _log.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); + LOGGER.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); } } - _log.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); } ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000); } @@ -115,7 +115,7 @@ public final class GrandBossManager implements IStorable public void setBossStatus(int bossId, int status) { _bossStatus.put(bossId, status); - _log.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); + LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); updateDb(bossId, true); } @@ -194,7 +194,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); return false; } return true; @@ -242,7 +242,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index e8b430a5df..c7290b6912 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public final class ItemsOnGroundManager implements Runnable { - private static final Logger _log = Logger.getLogger(ItemsOnGroundManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemsOnGroundManager.class.getName()); private final Set _items = ConcurrentHashMap.newKeySet(); @@ -88,7 +88,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); } } @@ -137,11 +137,11 @@ public final class ItemsOnGroundManager implements Runnable } } } - _log.info(getClass().getSimpleName() + ": Loaded " + count + " items."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + count + " items."); } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); } if (Config.EMPTY_DROPPED_ITEM_TABLE_AFTER_LOAD) @@ -185,7 +185,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e1) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); } } @@ -235,13 +235,13 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); } } } catch (SQLException e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java index ba4fdd6b6c..f47cf3f813 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.variables.PlayerVariables; */ public class MentorManager { - private static final Logger _log = Logger.getLogger(MentorManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MentorManager.class.getName()); private final Map> _menteeData = new ConcurrentHashMap<>(); private final Map _mentors = new ConcurrentHashMap<>(); @@ -65,7 +65,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -85,7 +85,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -104,7 +104,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } finally { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index f0f9d590c3..07ca9d909e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class PetitionManager { - protected static final Logger _log = Logger.getLogger(PetitionManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PetitionManager.class.getName()); private final Map _pendingPetitions; private final Map _completedPetitions; @@ -55,7 +55,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getCompletedPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() @@ -63,7 +63,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getPendingPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } public boolean acceptPetition(L2PcInstance respondingAdmin, int petitionId) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java index c1df0ca78b..6208afb86b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.Shutdown; */ public class ServerRestartManager { - static final Logger _log = Logger.getLogger(ServerRestartManager.class.getName()); + static final Logger LOGGER = Logger.getLogger(ServerRestartManager.class.getName()); private String nextRestartTime = "unknown"; @@ -72,12 +72,12 @@ public class ServerRestartManager { nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime()); ThreadPool.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000)); - _log.info("Scheduled server restart at " + lastRestart.getTime() + "."); + LOGGER.info("Scheduled server restart at " + lastRestart.getTime() + "."); } } catch (Exception e) { - _log.info("The scheduled server restart config is not set properly, please correct it!"); + LOGGER.info("The scheduled server restart config is not set properly, please correct it!"); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java index 0cef166f06..e7fa0b41a8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; public final class SiegeManager { - private static final Logger _log = Logger.getLogger(SiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SiegeManager.class.getName()); private final Map> _controlTowers = new HashMap<>(); private final Map> _flameTowers = new HashMap<>(); @@ -103,7 +103,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -152,7 +152,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); } } @@ -183,7 +183,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); } } _controlTowers.put(castle.getResidenceId(), controlTowers); @@ -289,7 +289,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java index 5e16e5a91f..876a3a1ec9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class MessageDeletionTask implements Runnable { - private static final Logger _log = Logger.getLogger(MessageDeletionTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MessageDeletionTask.class.getName()); final int _msgId; @@ -76,7 +76,7 @@ public final class MessageDeletionTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); } } MailManager.getInstance().deleteMessageInDb(msg.getId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/BlockList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/BlockList.java index 627b0dbbe4..3ec7e52fe7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/BlockList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/BlockList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BlockList { - private static Logger _log = Logger.getLogger(BlockList.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlockList.class.getName()); private static final Map> OFFLINE_LIST = new ConcurrentHashMap<>(); private final L2PcInstance _owner; @@ -91,7 +91,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); } return list; } @@ -122,7 +122,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java index 7be7f3cb10..f44f27266b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate; */ public final class CharEffectList { - private static final Logger _log = Logger.getLogger(CharEffectList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); /** Queue containing all effects from buffs for this effect list. */ private volatile Queue _actives; /** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */ @@ -897,7 +897,7 @@ public final class CharEffectList // Passive effects don't need stack type! if (!skill.getAbnormalType().isNone()) { - _log.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); + LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); } // Check for passive skill conditions. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CursedWeapon.java index d579628d09..a9be2c6a4a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class CursedWeapon implements INamable { - private static final Logger _log = Logger.getLogger(CursedWeapon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CursedWeapon.class.getName()); // _name is the name of the cursed weapon associated with its ID. private final String _name; @@ -95,7 +95,7 @@ public class CursedWeapon implements INamable if ((_player != null) && _player.isOnline()) { // Remove from player - _log.info(_name + " being removed online."); + LOGGER.info(_name + " being removed online."); _player.abortAttack(); @@ -134,7 +134,7 @@ public class CursedWeapon implements INamable else { // Remove from Db - _log.info(_name + " being removed offline."); + LOGGER.info(_name + " being removed offline."); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?"); @@ -145,7 +145,7 @@ public class CursedWeapon implements INamable del.setInt(2, _itemId); if (del.executeUpdate() != 1) { - _log.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); + LOGGER.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); } // Restore the reputation @@ -154,12 +154,12 @@ public class CursedWeapon implements INamable ps.setInt(3, _playerId); if (ps.executeUpdate() != 1) { - _log.warning("Error while updating karma & pkkills for userId " + _playerId); + LOGGER.warning("Error while updating karma & pkkills for userId " + _playerId); } } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); } } } @@ -196,7 +196,7 @@ public class CursedWeapon implements INamable else if (_item != null) { _item.decayMe(); - _log.info(_name + " item has been removed from World."); + LOGGER.info(_name + " item has been removed from World."); } } @@ -492,7 +492,7 @@ public class CursedWeapon implements INamable } catch (SQLException e) { - _log.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); + LOGGER.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java index 13aef855d1..cb62c8c590 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -81,7 +81,7 @@ import com.l2jmobius.gameserver.util.Util; public class L2Clan implements IIdentifiable, INamable { - private static final Logger _log = Logger.getLogger(L2Clan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Clan.class.getName()); // SQL queries private static final String INSERT_CLAN_DATA = "INSERT INTO clan_data (clan_id,clan_name,clan_level,hasCastle,blood_alliance_count,blood_oath_count,ally_id,ally_name,leader_id,crest_id,crest_large_id,ally_crest_id,new_leader_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -273,7 +273,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); } } @@ -313,14 +313,14 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); } } broadcastClanStatus(); broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1).addString(member.getName())); - _log.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); + LOGGER.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); } /** @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - _log.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + getName() + " without clan leader!"); return ""; } return _leader.getName(); @@ -433,7 +433,7 @@ public class L2Clan implements IIdentifiable, INamable final L2ClanMember exMember = _members.remove(objectId); if (exMember == null) { - _log.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); + LOGGER.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); return; } final int leadssubpledge = getLeaderSubPledge(objectId); @@ -888,7 +888,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -932,7 +932,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -948,7 +948,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); } // Update variables at database @@ -991,7 +991,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); } } @@ -1032,7 +1032,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); } } @@ -1062,7 +1062,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); } } @@ -1137,7 +1137,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); } } @@ -1158,7 +1158,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); } } @@ -1200,7 +1200,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); } _notice = notice; @@ -1267,7 +1267,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); + LOGGER.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); } } } @@ -1275,7 +1275,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); } } @@ -1351,7 +1351,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.warning("Subpledge " + subType + " does not exist for clan " + this); + LOGGER.warning("Subpledge " + subType + " does not exist for clan " + this); return oldSkill; } } @@ -1383,7 +1383,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); @@ -1435,7 +1435,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } @@ -1781,7 +1781,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); } } @@ -1890,7 +1890,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); } broadcastToOnlineMembers(new PledgeShowInfoUpdate(_leader.getClan())); @@ -1955,7 +1955,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); } } @@ -1987,7 +1987,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); } } @@ -2023,7 +2023,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } for (L2ClanMember cm : getMembers()) @@ -2058,7 +2058,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); } } } @@ -2174,7 +2174,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); } } } @@ -2717,7 +2717,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); } setLevel(level); @@ -2763,7 +2763,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2800,7 +2800,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); } if (onlyThisClan) @@ -2846,7 +2846,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Mentee.java index 6122c5f6ac..a1eb3d2480 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class L2Mentee { - private static final Logger _log = Logger.getLogger(L2Mentee.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Mentee.class.getName()); private final int _objectId; private String _name; @@ -65,7 +65,7 @@ public class L2Mentee } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java index 5f14864046..38044ee767 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2Party extends AbstractPlayerGroup { - private static final Logger _log = Logger.getLogger(L2Party.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Party.class.getName()); // @formatter:off private static final double[] BONUS_EXP_SP = @@ -536,7 +536,7 @@ public class L2Party extends AbstractPlayerGroup } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } SystemMessage msg; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Territory.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Territory.java index 41cb26df2b..2ee5d868d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Territory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Territory.java @@ -28,7 +28,7 @@ import com.l2jmobius.commons.util.Rnd; */ public class L2Territory { - private static Logger _log = Logger.getLogger(L2Territory.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2Territory.class.getName()); protected static class Point { @@ -176,7 +176,7 @@ public class L2Territory return new Location(x, y, Rnd.get(zmin, _zMax)); } } - _log.warning("Can't make point for territory " + _terr); + LOGGER.warning("Can't make point for territory " + _terr); return null; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MacroList.java index 737e876e1e..577b101249 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MacroList.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SendMacroList; public class MacroList implements IRestorable { - private static final Logger _log = Logger.getLogger(MacroList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MacroList.class.getName()); private final L2PcInstance _owner; private int _macroId; @@ -154,7 +154,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store macro:", e); + LOGGER.log(Level.WARNING, "could not store macro:", e); } } @@ -169,7 +169,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete macro:", e); + LOGGER.log(Level.WARNING, "could not delete macro:", e); } } @@ -215,7 +215,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store shortcuts:", e); + LOGGER.log(Level.WARNING, "could not store shortcuts:", e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ShortCuts.java index 3f8d959ef6..81e2c6f902 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ShortCuts.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; public class ShortCuts implements IRestorable { - private static Logger _log = Logger.getLogger(ShortCuts.class.getName()); + private static Logger LOGGER = Logger.getLogger(ShortCuts.class.getName()); private static final int MAX_SHORTCUTS_PER_BAR = 12; private final L2PcInstance _owner; private final Map _shortCuts = new TreeMap<>(); @@ -100,7 +100,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); } } @@ -165,7 +165,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); } } @@ -195,7 +195,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TradeList.java index eeee7d0cae..f0f5a42ae6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TradeList.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class TradeList { - private static final Logger _log = Logger.getLogger(TradeList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TradeList.class.getName()); private final L2PcInstance _owner; private L2PcInstance _partner; @@ -198,45 +198,45 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Object o = L2World.getInstance().findObject(objectId); if (!(o instanceof L2ItemInstance)) { - _log.warning(_owner.getName() + ": Trying to add something other than an item!"); + LOGGER.warning(_owner.getName() + ": Trying to add something other than an item!"); return null; } final L2ItemInstance item = (L2ItemInstance) o; if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { - _log.warning(_owner.getName() + ": Attempt to add a restricted item!"); + LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) { - _log.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; } if ((count <= 0) || (count > item.getCount())) { - _log.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); return null; } if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -244,7 +244,7 @@ public class TradeList { if (checkitem.getObjectId() == objectId) { - _log.warning(_owner.getName() + ": Attempt to add an item that is already present!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that is already present!"); return null; } } @@ -268,14 +268,14 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); return null; } @@ -286,13 +286,13 @@ public class TradeList if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -315,13 +315,13 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } if (count < 0) { - _log.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); return null; } @@ -335,7 +335,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return null; } partnerList.invalidateConfirmation(); @@ -410,7 +410,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return false; } @@ -475,7 +475,7 @@ public class TradeList // Check for Owner validity if ((_owner == null) || (L2World.getInstance().getPlayer(_owner.getObjectId()) == null)) { - _log.warning("Invalid owner of TradeList"); + LOGGER.warning("Invalid owner of TradeList"); return false; } @@ -485,7 +485,7 @@ public class TradeList final L2ItemInstance item = _owner.checkItemManipulation(titem.getObjectId(), titem.getCount(), "transfer"); if ((item == null) || (item.getCount() < 1)) { - _log.warning(_owner.getName() + ": Invalid Item in TradeList"); + LOGGER.warning(_owner.getName() + ": Invalid Item in TradeList"); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 6e200ddb09..96527cad1e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -632,7 +632,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } @@ -690,7 +690,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -803,7 +803,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = getAggroList().get(target); if (ai == null) { - _log.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 944e723989..1ebbe0e5f3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -176,7 +176,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class L2Character extends L2Object implements ISkillsHolder, IDeletable { - public static final Logger _log = Logger.getLogger(L2Character.class.getName()); + public static final Logger LOGGER = Logger.getLogger(L2Character.class.getName()); private volatile Set> _attackByList; @@ -3278,7 +3278,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Temporary fix for character outside world region errors (should not happen) if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) { - _log.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); + LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); if (isPlayer()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 1caa0adf75..1ce08f4112 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -624,7 +624,7 @@ public class L2Npc extends L2Character } else { - _log.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); } } } @@ -1189,7 +1189,7 @@ public class L2Npc extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } if (isChannelized()) @@ -1560,7 +1560,7 @@ public class L2Npc extends L2Character if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); + LOGGER.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); return null; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java index 94fe6bb6b5..3dd9a9d68e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java @@ -395,7 +395,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed stopMove().", e); + LOGGER.log(Level.SEVERE, "Failed stopMove().", e); } try @@ -404,7 +404,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed oustPlayers().", e); + LOGGER.log(Level.SEVERE, "Failed oustPlayers().", e); } final ZoneRegion oldZoneRegion = ZoneManager.getInstance().getRegion(this); @@ -415,7 +415,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } oldZoneRegion.removeFromZones(this); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java index 8e72579b54..05339545d3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java @@ -61,7 +61,7 @@ public class L2ControlTowerInstance extends L2Tower } catch (Exception e) { - _log.log(Level.WARNING, "Error at L2ControlTowerInstance", e); + LOGGER.log(Level.WARNING, "Error at L2ControlTowerInstance", e); } } _guards.clear(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 6c554e10e0..91548e2a10 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -100,7 +100,7 @@ public class L2DecoyInstance extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } @@ -126,7 +126,7 @@ public class L2DecoyInstance extends L2Character } catch (Throwable e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index f9aa07f44d..97c2348dec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -123,7 +123,7 @@ public class L2DefenderInstance extends L2Attackable if ((_fort == null) && (_castle == null)) { - _log.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); + LOGGER.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 4fb7bbb976..baab09b858 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -219,7 +219,7 @@ public final class L2DoorInstance extends L2Character } else { - _log.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); + LOGGER.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 71096be532..1519fc6308 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -74,14 +74,14 @@ public class L2MerchantInstance extends L2NpcInstance final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } if (!buyList.isNpcAllowed(getId())) { - _log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); + LOGGER.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 44f654a922..2fb8207aff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -1309,7 +1309,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Attempted to remove unknown RecipeList: " + recipeId); + LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } for (Shortcut sc : getAllShortCuts()) @@ -1334,7 +1334,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -1350,7 +1350,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -2602,7 +2602,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Skipping null auto-get skill for player: " + toString()); + LOGGER.warning("Skipping null auto-get skill for player: " + toString()); } } } @@ -3248,7 +3248,7 @@ public final class L2PcInstance extends L2Playable final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); + LOGGER.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); return null; } // Sends message to client if requested @@ -3291,7 +3291,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof L2EtcItem ? (L2EtcItem) item : null); if (handler == null) { - _log.warning("No item handler registered for Herb ID " + item.getId() + "!"); + LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!"); } else { @@ -3809,7 +3809,7 @@ public final class L2PcInstance extends L2Playable // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { - _log.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); return null; } @@ -3817,19 +3817,19 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return null; } if ((count < 0) || ((count > 1) && !item.isStackable())) { - _log.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); return null; } if (count > item.getCount()) { - _log.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); return null; } @@ -3858,7 +3858,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_protectEndTime > 0))) { - _log.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _protectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -3868,7 +3868,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_teleportProtectEndTime > 0))) { - _log.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _teleportProtectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -4383,7 +4383,7 @@ public final class L2PcInstance extends L2Playable if (!object.isItem()) { // dont try to pickup anything that is not an item :) - _log.warning(this + " trying to pickup wrong target." + getTarget()); + LOGGER.warning(this + " trying to pickup wrong target." + getTarget()); return; } @@ -4483,7 +4483,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -5142,11 +5142,11 @@ public final class L2PcInstance extends L2Playable if (isKarmaDrop) { - _log.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } else { - _log.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } if (++dropCount >= dropLimit) @@ -6240,7 +6240,7 @@ public final class L2PcInstance extends L2Playable L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level); if (accessLevel == null) { - _log.warning("Can't find access level " + level + " for character " + toString()); + LOGGER.warning("Can't find access level " + level + " for character " + toString()); accessLevel = AdminData.getInstance().getAccessLevel(0); } @@ -6249,7 +6249,7 @@ public final class L2PcInstance extends L2Playable accessLevel = AdminData.getInstance().getAccessLevel(Config.DEFAULT_ACCESS_LEVEL); if (accessLevel == null) { - _log.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); + LOGGER.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); accessLevel = AdminData.getInstance().getAccessLevel(0); Config.DEFAULT_ACCESS_LEVEL = 0; } @@ -6275,7 +6275,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); + LOGGER.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); } } @@ -6283,11 +6283,11 @@ public final class L2PcInstance extends L2Playable if (accessLevel == null) { - _log.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); + LOGGER.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); } else if (level > 0) { - _log.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); + LOGGER.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); } } @@ -6396,7 +6396,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed updating character online status.", e); + LOGGER.log(Level.SEVERE, "Failed updating character online status.", e); } } @@ -6449,7 +6449,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); return false; } return true; @@ -6597,7 +6597,7 @@ public final class L2PcInstance extends L2Playable catch (Exception e) { player.setBaseClass(activeClassId); - _log.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); + LOGGER.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); } // Restore Subclass Data (cannot be done earlier in function) @@ -6620,7 +6620,7 @@ public final class L2PcInstance extends L2Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - _log.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -6761,7 +6761,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed loading character.", e); + LOGGER.log(Level.SEVERE, "Failed loading character.", e); } return player; } @@ -6851,7 +6851,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); } return true; } @@ -6959,7 +6959,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); } } @@ -6989,7 +6989,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); } } @@ -7005,7 +7005,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); } } @@ -7020,7 +7020,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.severe("Could not delete premium item: " + e); + LOGGER.severe("Could not delete premium item: " + e); } } @@ -7138,7 +7138,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); } } @@ -7168,7 +7168,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); } } @@ -7292,7 +7292,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store char effect data: ", e); } } @@ -7324,7 +7324,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char item reuse data: ", e); + LOGGER.log(Level.WARNING, "Could not store char item reuse data: ", e); } } @@ -7413,7 +7413,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); } } @@ -7473,12 +7473,12 @@ public final class L2PcInstance extends L2Playable } // else // { - // _log.warning("Could not store new skill, it's null!"); + // LOGGER.warning("Could not store new skill, it's null!"); // } } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7513,7 +7513,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7541,7 +7541,7 @@ public final class L2PcInstance extends L2Playable if (skill == null) { - _log.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); + LOGGER.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); continue; } @@ -7564,7 +7564,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); } } @@ -7622,7 +7622,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } } @@ -7688,7 +7688,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); } } @@ -7751,7 +7751,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); } // Calculate henna modifiers of this player. @@ -7819,7 +7819,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed removing character henna.", e); + LOGGER.log(Level.SEVERE, "Failed removing character henna.", e); } // Calculate Henna modifiers of this L2PcInstance @@ -7901,7 +7901,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed saving character henna.", e); + LOGGER.log(Level.SEVERE, "Failed saving character henna.", e); } // Task for henna duration @@ -8054,7 +8054,7 @@ public final class L2PcInstance extends L2Playable if (isLocked()) { - _log.warning("Player " + getName() + " tried to restart/logout during class change."); + LOGGER.warning("Player " + getName() + " tried to restart/logout during class change."); return false; } @@ -8398,7 +8398,7 @@ public final class L2PcInstance extends L2Playable if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { - _log.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); + LOGGER.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -9521,7 +9521,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); return false; } @@ -9636,7 +9636,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -9724,7 +9724,7 @@ public final class L2PcInstance extends L2Playable final L2PcTemplate pcTemplate = PlayerTemplateData.getInstance().getTemplate(classId); if (pcTemplate == null) { - _log.severe("Missing template for classId: " + classId); + LOGGER.severe("Missing template for classId: " + classId); throw new Error(); } // Set the template of the L2PcInstance @@ -9807,7 +9807,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -10047,7 +10047,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10059,7 +10059,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogin(this), this); @@ -10544,7 +10544,7 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return false; } @@ -10686,7 +10686,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) @@ -10694,13 +10694,13 @@ public final class L2PcInstance extends L2Playable { if (!isOnline()) { - _log.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); + LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } setOnlineStatus(false, true); } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10712,7 +10712,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10724,7 +10724,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove combat flag @@ -10747,7 +10747,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10760,7 +10760,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10772,7 +10772,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Recommendations must be saved before task (timer) is canceled @@ -10782,7 +10782,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop the HP/MP/CP Regeneration task (scheduled tasks) try @@ -10791,7 +10791,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10800,7 +10800,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop crafting, if in progress @@ -10810,7 +10810,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Cancel Attak or Cast @@ -10820,7 +10820,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isChannelized()) @@ -10841,7 +10841,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // If a Party is in progress, leave it (and festival party) @@ -10853,7 +10853,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10888,7 +10888,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // returns pet to control item } @@ -10906,7 +10906,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10926,7 +10926,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10946,7 +10946,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove player from instance @@ -10959,7 +10959,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10969,7 +10969,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its inventory and remove them from the world @@ -10979,7 +10979,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its warehouse and remove them from the world @@ -10989,7 +10989,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (Config.WAREHOUSE_CACHE) { @@ -11002,7 +11002,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11011,7 +11011,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isCursedWeaponEquipped()) @@ -11022,7 +11022,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11070,7 +11070,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); } // Stop all passives and augment options @@ -11764,7 +11764,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); + LOGGER.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); } } } @@ -11893,7 +11893,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); } } @@ -11913,7 +11913,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -12062,7 +12062,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); } @@ -12083,7 +12083,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); } } @@ -12302,7 +12302,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); } } @@ -12399,7 +12399,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); + LOGGER.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); } } } @@ -12425,7 +12425,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); } } @@ -12674,12 +12674,12 @@ public final class L2PcInstance extends L2Playable if (nextLevel == -1) { - _log.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from player " + toString()); removeSkill(skill, true); // there is no lower skill } else { - _log.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } @@ -12825,7 +12825,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); } } @@ -12869,7 +12869,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); } } @@ -12889,7 +12889,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); } } @@ -13658,14 +13658,14 @@ public final class L2PcInstance extends L2Playable { sendMessage("The command " + command.substring(6) + " does not exist!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, getAccessLevel())) { sendMessage("You don't have the access rights to use this command!"); - _log.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); + LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 5718895451..ca24302555 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -576,7 +576,7 @@ public class L2PetInstance extends L2Summon final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -771,7 +771,7 @@ public class L2PetInstance extends L2Summon if (removedItem == null) { - _log.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); + LOGGER.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); } else { @@ -1059,7 +1059,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not store pet effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store pet effect data: ", e); } } @@ -1098,7 +1098,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { @@ -1404,7 +1404,7 @@ public class L2PetInstance extends L2Summon } else { - _log.warning("Pet control item null, for pet: " + toString()); + LOGGER.warning("Pet control item null, for pet: " + toString()); } super.setName(name); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 2c113f3992..fcd45fb1b0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -376,7 +376,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store summon effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store summon effect data: ", e); } } @@ -442,7 +442,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index 26bc7343bc..14138d4ce2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2VillageMasterInstance extends L2NpcInstance { - private static Logger _log = Logger.getLogger(L2VillageMasterInstance.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2VillageMasterInstance.class.getName()); /** * Creates a village master. @@ -363,7 +363,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } catch (Exception NumberFormatException) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Wrong numeric values for command " + command); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Wrong numeric values for command " + command); } Set subsAvailable = null; @@ -504,7 +504,7 @@ public class L2VillageMasterInstance extends L2NpcInstance */ if (!player.getFloodProtectors().getSubclass().tryPerformAction("add subclass")) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); return; } @@ -570,7 +570,7 @@ public class L2VillageMasterInstance extends L2NpcInstance */ if (!player.getFloodProtectors().getSubclass().tryPerformAction("change class")) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); return; } @@ -650,7 +650,7 @@ public class L2VillageMasterInstance extends L2NpcInstance */ if (!player.getFloodProtectors().getSubclass().tryPerformAction("change class")) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); return; } @@ -1226,7 +1226,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } catch (PatternSyntaxException e) { - _log.warning("ERROR: Wrong pattern for clan name!"); + LOGGER.warning("ERROR: Wrong pattern for clan name!"); pattern = Pattern.compile(".*"); } return pattern.matcher(name).matches(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java index b448f021a8..d2cd097234 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java @@ -93,7 +93,7 @@ public class PetStat extends SummonStat { if (getActiveChar() != null) { - _log.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); + LOGGER.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); } throw e; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index aaecadf5c5..222d29419e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp public class PlayableStat extends CharStat { - protected static final Logger _log = Logger.getLogger(PlayableStat.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PlayableStat.class.getName()); public PlayableStat(L2Playable activeChar) { @@ -195,7 +195,7 @@ public class PlayableStat extends CharStat { if (value < 0) { - _log.warning("wrong usage"); + LOGGER.warning("wrong usage"); return false; } final long currentSp = getSp(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index 352a7719ae..0ce091c546 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.stats.Stats; public class CharStatus { - protected static final Logger _log = Logger.getLogger(CharStatus.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(CharStatus.class.getName()); private final L2Character _activeChar; @@ -449,7 +449,7 @@ public class CharStatus } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java index 3fa6773fd2..1b1003f76d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc; */ public class RandomAnimationTask implements Runnable { - private static final Logger _log = Logger.getLogger(RandomAnimationTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RandomAnimationTask.class.getName()); private final L2Npc _npc; private boolean _stopTask; @@ -70,7 +70,7 @@ public class RandomAnimationTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); + LOGGER.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java index 39eaa5b37a..755ae87ebc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction; */ public class TrapTask implements Runnable { - private static final Logger _log = Logger.getLogger(TrapTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TrapTask.class.getName()); private static final int TICK = 1000; // 1s private final L2TrapInstance _trap; @@ -65,7 +65,7 @@ public class TrapTask implements Runnable } catch (Exception e) { - _log.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); _trap.unSummon(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java index 1801510a6b..a08fc73212 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.LeaveWorld; */ public class GameGuardCheckTask implements Runnable { - private static final Logger _log = Logger.getLogger(GameGuardCheckTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GameGuardCheckTask.class.getName()); private final L2PcInstance _player; @@ -47,7 +47,7 @@ public class GameGuardCheckTask implements Runnable if ((client != null) && !client.isAuthedGG() && _player.isOnline()) { AdminData.getInstance().broadcastMessageToGMs("Client " + client + " failed to reply GameGuard query and is being kicked!"); - _log.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); + LOGGER.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); client.close(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 23cfffc2bb..fc78d6a4db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.Disconnection; */ public final class IllegalPlayerActionTask implements Runnable { - private static final Logger _log = Logger.getLogger("audit"); + private static final Logger LOGGER = Logger.getLogger("audit"); private final String _message; private final IllegalActionPunishmentType _punishment; @@ -74,7 +74,7 @@ public final class IllegalPlayerActionTask implements Runnable @Override public void run() { - _log.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); + LOGGER.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); AdminData.getInstance().broadcastMessageToGMs(_message); if (!_actor.isGM()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index 8b4bd27212..73c3219140 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PetFeedTask implements Runnable { - private static final Logger _log = Logger.getLogger(PetFeedTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PetFeedTask.class.getName()); private final L2PcInstance _player; @@ -99,7 +99,7 @@ public class PetFeedTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); + LOGGER.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/Announcement.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/Announcement.java index 3873f71d14..4e5aa84b0f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/Announcement.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/Announcement.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class Announcement implements IAnnouncement { - protected static final Logger _log = Logger.getLogger(Announcement.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Announcement.class.getName()); private static final String INSERT_QUERY = "INSERT INTO announcements (type, content, author) VALUES (?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE announcements SET type = ?, content = ?, author = ? WHERE id = ?"; @@ -125,7 +125,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -145,7 +145,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -162,7 +162,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java index f85c9affc0..a18af9fc50 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,7 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; - private static final Logger _log = Logger.getLogger(AnnouncementType.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) { @@ -40,7 +40,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); return NORMAL; } @@ -53,7 +53,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); return NORMAL; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index a47ba1a0a5..ebee3cd82c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -114,7 +114,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -137,7 +137,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/buylist/Product.java index 97571235ed..03b1a51b6b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; */ public final class Product { - private static final Logger _log = Logger.getLogger(Product.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Product.class.getName()); private final int _buyListId; private final L2Item _item; @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - _log.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index 8d2e52b55c..6eefb3679e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public final class ConditionPlayerGrade extends Condition { - protected static final Logger _log = Logger.getLogger(ConditionPlayerGrade.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ConditionPlayerGrade.class.getName()); // conditional values public static final int COND_NO_GRADE = 0x0001; public static final int COND_D_GRADE = 0x0002; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 90ac2108aa..805960c36b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public abstract class AbstractEffect { - protected static final Logger _log = Logger.getLogger(AbstractEffect.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEffect.class.getName()); private int _ticks; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index 6892d0798a..ce7a68dcc7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -56,7 +56,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class BlockCheckerEngine { - protected static final Logger _log = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -309,7 +309,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); + LOGGER.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); } } @@ -417,7 +417,7 @@ public final class BlockCheckerEngine // Wrong arena passed, stop event if (_arena == -1) { - _log.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); + LOGGER.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); return; } _isStarted = true; @@ -508,7 +508,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Spawn the block carrying girl @@ -530,8 +530,8 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } @@ -558,7 +558,7 @@ public final class BlockCheckerEngine { if (_spawn == null) { - _log.warning("HBCE: Block Carrying Girl is null"); + LOGGER.warning("HBCE: Block Carrying Girl is null"); return; } SpawnTable.getInstance().deleteSpawn(_spawn, false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java index a6faf0b0df..4fa38d85d4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public final class Castle extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Castle.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Castle.class.getName()); private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); @@ -212,7 +212,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -232,7 +232,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; } @@ -542,7 +542,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } oldOwner.setCastleId(0); // Unset has castle flag for old owner for (L2PcInstance member : oldOwner.getOnlineMembers(0)) @@ -683,7 +683,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); } } @@ -704,7 +704,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); } } @@ -724,7 +724,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -801,7 +801,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); } } @@ -821,7 +821,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -848,7 +848,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); } } } @@ -891,7 +891,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -1042,7 +1042,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); } } @@ -1086,7 +1086,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -1110,7 +1110,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); } } final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(getResidenceId()).get(towerIndex); @@ -1135,7 +1135,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -1184,7 +1184,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); return; } spawn.setX(holder.getX()); @@ -1219,7 +1219,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } _castleSide = side; Broadcast.toAllOnlinePlayers(new ExCastleState(this)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Couple.java index c31232e232..c40e7d454a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Couple.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class Couple { - private static final Logger _log = Logger.getLogger(Couple.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Couple.class.getName()); private int _Id = 0; private int _player1Id = 0; @@ -67,7 +67,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); } } @@ -99,7 +99,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); } } @@ -117,7 +117,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); } } @@ -131,7 +131,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Duel.java index d601203f8d..826a7beece 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class Duel { - protected static final Logger _log = Logger.getLogger(Duel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Duel.class.getName()); public static final int DUELSTATE_NODUEL = 0; public static final int DUELSTATE_DUELLING = 1; @@ -223,7 +223,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); } } } @@ -266,7 +266,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); } } } @@ -291,7 +291,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); } } } @@ -994,7 +994,7 @@ public class Duel { if ((player != _playerA) && (player != _playerB)) { - _log.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); + LOGGER.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); } if (_playerA == player) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java index 75ec9236b8..aaece02dae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Fort extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Fort.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Fort.class.getName()); private final List _doors = new ArrayList<>(); private L2StaticObjectInstance _flagPole = null; @@ -227,7 +227,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Fort extends AbstractResidence { if (clan == null) { - _log.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); + LOGGER.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); return false; } @@ -396,7 +396,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } removeOwner(true); } @@ -496,7 +496,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); } } @@ -606,7 +606,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } @@ -627,7 +627,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); } } @@ -647,7 +647,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -744,7 +744,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -775,7 +775,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); } } @@ -844,7 +844,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -968,7 +968,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); } } } @@ -1008,7 +1008,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); } } @@ -1154,7 +1154,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1183,7 +1183,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1213,7 +1213,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1249,7 +1249,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 053af69e9d..80e02260d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class FortSiege implements Siegable { - protected static final Logger _log = Logger.getLogger(FortSiege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortSiege.class.getName()); // SQL private static final String DELETE_FORT_SIEGECLANS_BY_CLAN_ID = "DELETE FROM fortsiege_clans WHERE fort_id = ? AND clan_id = ?"; @@ -82,7 +82,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -169,12 +169,12 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); + LOGGER.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); } } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); } } } @@ -195,7 +195,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -218,7 +218,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -293,7 +293,7 @@ public class FortSiege implements Siegable getFort().setVisibleFlag(true); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -343,7 +343,7 @@ public class FortSiege implements Siegable announceToPlayer(sm); saveFortSiege(); - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -533,7 +533,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -689,7 +689,7 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); } } } @@ -816,7 +816,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); } } @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new FortSiege.ScheduleStartSiegeTask(60), 0); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); } } } @@ -1013,7 +1013,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1066,7 +1066,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1092,7 +1092,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); } } @@ -1120,7 +1120,7 @@ public class FortSiege implements Siegable catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/L2Event.java index be28d47897..dbdbdae0e9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/L2Event.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/L2Event.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class L2Event { - protected static final Logger _log = Logger.getLogger(L2Event.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2Event.class.getName()); public static EventState eventState = EventState.OFF; public static String _eventName = ""; public static String _eventCreator = ""; @@ -151,7 +151,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); } } } @@ -187,7 +187,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); } } @@ -308,7 +308,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); } } @@ -399,7 +399,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event participation, an error has occured."; } @@ -475,7 +475,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event, an error has occured."; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Siege.java index 8987391e4f..52c64946e9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class Siege implements Siegable { - protected static final Logger _log = Logger.getLogger(Siege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Siege.class.getName()); // typeId's public static final byte OWNER = -1; @@ -142,7 +142,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -215,7 +215,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -781,7 +781,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -798,7 +798,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); } } @@ -983,7 +983,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); } } @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - _log.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); loadSiegeClan(); @@ -1275,7 +1275,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1360,7 +1360,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1428,7 +1428,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); } } @@ -1482,7 +1482,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); } _controlTowerCount = _controlTowers.size(); } @@ -1506,7 +1506,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 26d733e4c1..12551f22ba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -161,7 +161,7 @@ import com.l2jmobius.gameserver.util.MinionList; */ public abstract class AbstractScript extends ManagedScript implements IEventTimerEvent, IEventTimerCancel { - protected static final Logger _log = Logger.getLogger(AbstractScript.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractScript.class.getName()); private final Map> _registeredIds = new ConcurrentHashMap<>(); private final Queue _listeners = new PriorityBlockingQueue<>(); private volatile TimerExecutor _timerExecutor; @@ -185,7 +185,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime public void onTimerEvent(String event, StatsSet params, L2Npc npc, L2PcInstance player) { - _log.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); + LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } public void onTimerCancel(String event, StatsSet params, L2Npc npc, L2PcInstance player) @@ -229,17 +229,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final EventType eventType = listener.value(); if (method.getParameterCount() != 1) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); continue; } else if (!eventType.isEventClass(method.getParameterTypes()[0])) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); continue; } else if (!eventType.isReturnClass(method.getReturnType())) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); continue; } @@ -275,7 +275,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final Range range = (Range) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -291,7 +291,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -306,12 +306,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final NpcLevelRange range = (NpcLevelRange) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -329,12 +329,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -391,7 +391,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -409,7 +409,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -499,7 +499,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -517,7 +517,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -536,7 +536,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -553,7 +553,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -596,7 +596,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -613,7 +613,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -633,7 +633,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -651,7 +651,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -671,7 +671,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -689,7 +689,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -709,7 +709,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -727,7 +727,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -1018,7 +1018,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1036,7 +1036,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1723,7 +1723,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } @@ -1843,7 +1843,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } } @@ -2216,7 +2216,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime if ((x == 0) && (y == 0)) { - _log.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); + LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); return null; } @@ -2258,7 +2258,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } catch (Exception e) { - _log.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); + LOGGER.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); } return null; @@ -3138,7 +3138,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (!door.isOpen()) { @@ -3156,7 +3156,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (door.isOpen()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java index c25f5189f6..231cef15b4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public final class EventDispatcher { - private static final Logger _log = Logger.getLogger(EventDispatcher.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EventDispatcher.class.getName()); protected EventDispatcher() { @@ -83,7 +83,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -172,7 +172,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -237,7 +237,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java index 4b21e92c36..97dc1b1142 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class AnnotationEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(AnnotationEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnotationEventListener.class.getName()); private final Method _callback; public AnnotationEventListener(ListenersContainer container, EventType type, Method callback, Object owner, int priority) @@ -54,7 +54,7 @@ public class AnnotationEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java index 0d5b4a601c..56fb7b03ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class FunctionEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(FunctionEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FunctionEventListener.class.getName()); private final Function _callback; @SuppressWarnings("unchecked") @@ -50,7 +50,7 @@ public class FunctionEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index cb65209f93..1501c166e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public abstract class ItemContainer { - protected static final Logger _log = Logger.getLogger(ItemContainer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ItemContainer.class.getName()); protected final Map _items = new ConcurrentHashMap<>(); @@ -287,7 +287,7 @@ public abstract class ItemContainer final L2Item template = ItemTable.getInstance().getTemplate(itemId); if (template == null) { - _log.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); + LOGGER.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); return null; } @@ -702,7 +702,7 @@ public abstract class ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index cb2d9362ba..5bb5770412 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -139,7 +139,7 @@ public class Mail extends ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index 7fce82d4af..c7a3128aa9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; public class PcInventory extends Inventory { - private static final Logger _log = Logger.getLogger(PcInventory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PcInventory.class.getName()); private final L2PcInstance _owner; private L2ItemInstance _adena; @@ -761,7 +761,7 @@ public class PcInventory extends Inventory } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); } return paperdoll; } @@ -974,7 +974,7 @@ public class PcInventory extends Inventory { if ((type != EtcItemType.ARROW) && (type != EtcItemType.BOLT)) { - _log.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); + LOGGER.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java index 37e0216702..ded347d03a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java @@ -71,7 +71,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "addItem()", e); + LOGGER.log(Level.SEVERE, "addItem()", e); } } @@ -93,7 +93,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } _items.clear(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index a988fe1fec..c5a70ee9be 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.items.type.ItemType; */ public abstract class AbstractEnchantItem { - protected static final Logger _log = Logger.getLogger(AbstractEnchantItem.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); private static final ItemType[] ENCHANT_TYPES = new ItemType[] { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java index d4af9b02f5..2a7e5652dc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.holders.RangeChanceHolder; */ public final class EnchantItemGroup { - private static final Logger _log = Logger.getLogger(EnchantItemGroup.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); private final List _chances = new ArrayList<>(); private final String _name; @@ -68,10 +68,10 @@ public final class EnchantItemGroup return holder.getChance(); } } - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); return _chances.get(_chances.size() - 1).getChance(); } - _log.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); return -1; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index b93772addc..e0e75f064f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -142,14 +142,14 @@ public final class EnchantScroll extends AbstractEnchantItem { if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) { - _log.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); return -1; } final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); if (group == null) { - _log.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); return -1; } return group.getChance(enchantItem.getEnchantLevel()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 076cfe435a..2ca4331a23 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -1281,7 +1281,7 @@ public final class L2ItemInstance extends L2Object */ public static class ScheduleConsumeManaTask implements Runnable { - private static final Logger _log = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); private final L2ItemInstance _shadowItem; public ScheduleConsumeManaTask(L2ItemInstance item) @@ -1302,7 +1302,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 7556af343a..46097d99e5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public abstract class AbstractOlympiadGame { - protected static final Logger _log = Logger.getLogger(AbstractOlympiadGame.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractOlympiadGame.class.getName()); protected static final Logger _logResults = Logger.getLogger("olympiad"); protected static final String POINTS = "olympiad_points"; @@ -186,7 +186,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return false; } return true; @@ -287,7 +287,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -340,7 +340,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -387,7 +387,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "playerStatusBack()", e); + LOGGER.log(Level.WARNING, "playerStatusBack()", e); } } @@ -434,7 +434,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java index 6069b35ec8..714e479916 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OlympiadGameManager implements Runnable { - private static final Logger _log = Logger.getLogger(OlympiadGameManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlympiadGameManager.class.getName()); private static final int STADIUM_COUNT = 80; // TODO dynamic private volatile boolean _battleStarted = false; @@ -60,7 +60,7 @@ public class OlympiadGameManager implements Runnable _tasks.add(stadium); } - _log.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); + LOGGER.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); } public static OlympiadGameManager getInstance() @@ -188,7 +188,7 @@ public class OlympiadGameManager implements Runnable { OlympiadManager.getInstance().clearRegistered(); _battleStarted = false; - _log.info("Olympiad System: All current games finished."); + LOGGER.info("Olympiad System: All current games finished."); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 2108adfcb2..c82b326970 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -167,7 +167,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return false; } return result; @@ -388,7 +388,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (_playerTwo.isDefaulted()) @@ -415,7 +415,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (winside == 1) @@ -431,7 +431,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -536,7 +536,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -673,7 +673,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (SQLException e) { - _log.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); + LOGGER.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index d18e278286..8ef4db814e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class OlympiadGameTask implements Runnable { - protected static final Logger _log = Logger.getLogger(OlympiadGameTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(OlympiadGameTask.class.getName()); private static final int[] TELEPORT_TO_ARENA_TIMES = { @@ -163,7 +163,7 @@ public final class OlympiadGameTask implements Runnable { if ((game != null) && (_state != GameState.IDLE)) { - _log.warning("Attempt to overwrite non-finished game in state " + _state); + LOGGER.warning("Attempt to overwrite non-finished game in state " + _state); return; } @@ -352,14 +352,14 @@ public final class OlympiadGameTask implements Runnable case CLEANUP: case IDLE: { - _log.warning("Unable to return players back in town, exception: " + e.getMessage()); + LOGGER.warning("Unable to return players back in town, exception: " + e.getMessage()); _state = GameState.IDLE; _game = null; return; } } - _log.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); _state = GameState.GAME_STOPPED; ThreadPool.schedule(this, 1000); } @@ -417,7 +417,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -446,7 +446,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -463,7 +463,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; @@ -480,7 +480,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -489,7 +489,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -498,7 +498,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -507,7 +507,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -522,7 +522,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -531,7 +531,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -540,7 +540,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -549,7 +549,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -558,7 +558,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index d4720828f5..037b43e894 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; */ public class PunishmentTask implements Runnable { - protected static final Logger _log = Logger.getLogger(PunishmentTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PunishmentTask.class.getName()); private static final String INSERT_QUERY = "INSERT INTO punishments (`key`, `affect`, `type`, `expiration`, `reason`, `punishedBy`) VALUES (?, ?, ?, ?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE punishments SET expiration = ? WHERE id = ?"; @@ -203,7 +203,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); } } @@ -230,7 +230,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 495a0d648b..0a5994e0d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class LongTimeEvent extends Quest { - protected Logger _log = Logger.getLogger(getClass().getName()); + protected Logger LOGGER = Logger.getLogger(getClass().getName()); protected String _eventName; boolean _enableShrines = false; @@ -86,17 +86,17 @@ public class LongTimeEvent extends Quest if (_eventPeriod.isWithinRange(new Date())) { startEvent(); - _log.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); + LOGGER.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); } else if (_eventPeriod.getStartDate().after(new Date())) { final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); - _log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); + LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } else { - _log.info("Event " + _eventName + " has passed... Ignored "); + LOGGER.info("Event " + _eventName + " has passed... Ignored "); } } } @@ -179,19 +179,19 @@ public class LongTimeEvent extends Quest if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); continue; } if (minCount > maxCount) { - _log.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); continue; } if ((finalChance < 10000) || (finalChance > 1000000)) { - _log.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); continue; } @@ -199,7 +199,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); } } } @@ -221,7 +221,7 @@ public class LongTimeEvent extends Quest if (NpcData.getInstance().getTemplate(npcId) == null) { - _log.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); + LOGGER.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); continue; } @@ -229,7 +229,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java index 0c8a3b044b..b1ef6c3f23 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -84,7 +84,7 @@ import com.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class Quest extends AbstractScript implements IIdentifiable { - public static final Logger _log = Logger.getLogger(Quest.class.getName()); + public static final Logger LOGGER = Logger.getLogger(Quest.class.getName()); /** Map containing lists of timers from the name of the timer. */ private volatile Map> _questTimers = null; @@ -523,7 +523,7 @@ public class Quest extends AbstractScript implements IIdentifiable { showError(trigger.getActingPlayer(), e); } - _log.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); return; } if (trigger.getActingPlayer() != null) @@ -543,7 +543,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); } } @@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); } } @@ -864,7 +864,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); } } @@ -933,7 +933,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); } } @@ -948,7 +948,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); } } @@ -963,7 +963,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); } } @@ -978,7 +978,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); } } @@ -995,7 +995,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); } return false; } @@ -1008,7 +1008,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); return; } } @@ -1513,10 +1513,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public boolean showError(L2PcInstance player, Throwable t) { - _log.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); + LOGGER.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); if (t.getMessage() == null) { - _log.warning(getClass().getSimpleName() + ": " + t.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + t.getMessage()); } if ((player != null) && player.getAccessLevel().isGm()) { @@ -1607,7 +1607,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - _log.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1638,7 +1638,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - _log.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); @@ -1656,7 +1656,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1680,7 +1680,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1703,7 +1703,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not update char quest:", e); + LOGGER.log(Level.WARNING, "could not update char quest:", e); } } @@ -1724,7 +1724,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Unable to delete char quest!", e); + LOGGER.log(Level.WARNING, "Unable to delete char quest!", e); } } @@ -1748,7 +1748,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete char quest:", e); + LOGGER.log(Level.WARNING, "could not delete char quest:", e); } } @@ -2804,7 +2804,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if ((id != 0) && (ItemTable.getInstance().getTemplate(id) == null)) { - _log.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); } } _questItemIds = items; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 23c0acc8d1..40aa1878fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.util.Util; */ public final class QuestState { - protected static final Logger _log = Logger.getLogger(QuestState.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestState.class.getName()); /** The name of the quest of this QuestState */ private final String _questName; @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - _log.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - _log.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 64f6afb219..4013de0733 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class QuestTimer { - protected static final Logger _log = Logger.getLogger(QuestTimer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestTimer.class.getName()); public class ScheduleTimerTask implements Runnable { @@ -48,7 +48,7 @@ public class QuestTimer } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java index 64f04389a2..1c7ac4a6ab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance; */ public class L2ShuttleEngine implements Runnable { - private static final Logger _log = Logger.getLogger(L2ShuttleEngine.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2ShuttleEngine.class.getName()); private static final int DELAY = 15 * 1000; @@ -117,7 +117,7 @@ public class L2ShuttleEngine implements Runnable } catch (Exception e) { - _log.log(Level.INFO, e.getMessage(), e); + LOGGER.log(Level.INFO, e.getMessage(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java index 6148235551..19a1a61b20 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Skill implements IIdentifiable { - private static final Logger _log = Logger.getLogger(Skill.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Skill.class.getName()); /** Skill ID. */ private final int _id; @@ -295,7 +295,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); + LOGGER.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); } } } @@ -426,7 +426,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); + LOGGER.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); } } } @@ -1139,7 +1139,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); } } activeChar.sendMessage("Target type of skill " + this + " is not currently handled."); @@ -1168,7 +1168,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); } } activeChar.sendMessage("Target affect scope of skill " + this + " is not currently handled."); @@ -1196,7 +1196,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); } } else @@ -1608,7 +1608,7 @@ public final class Skill implements IIdentifiable } else { - _log.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); + LOGGER.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 66b9f7e4b2..8e607be078 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SkillChannelizer implements Runnable { - private static final Logger _log = Logger.getLogger(SkillChannelizer.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SkillChannelizer.class.getName()); private final L2Character _channelizer; private List _channelized; @@ -72,7 +72,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); + LOGGER.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); return; } @@ -86,7 +86,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (!isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); + LOGGER.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); return; } @@ -192,7 +192,7 @@ public class SkillChannelizer implements Runnable final Skill channeledSkill = SkillData.getInstance().getSkill(skill.getChannelingSkillId(), skillLevel); if (channeledSkill == null) { - _log.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); + LOGGER.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); _channelizer.abortCast(); return; } @@ -229,7 +229,7 @@ public class SkillChannelizer implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); + LOGGER.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java index 7d6f856c18..8b91fc77d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class AccountVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(AccountVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AccountVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM account_gsdata WHERE account_name = ?"; @@ -64,7 +64,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); return false; } finally @@ -107,7 +107,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); return false; } finally @@ -134,7 +134,7 @@ public class AccountVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java index 390e2f166a..50fcf2ab6f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ClanVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ClanVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM clan_variables WHERE clanId = ?"; @@ -64,7 +64,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -107,7 +107,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -134,7 +134,7 @@ public class ClanVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java index bcd7f557fd..c7ba2ff071 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ItemVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ItemVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM item_variables WHERE id = ?"; @@ -69,7 +69,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); + LOGGER.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); return false; } return true; @@ -93,7 +93,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -136,7 +136,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -163,7 +163,7 @@ public class ItemVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java index 999b4cdd64..85508e687b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class PlayerVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(PlayerVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PlayerVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM character_variables WHERE charId = ?"; @@ -90,7 +90,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); return false; } finally @@ -133,7 +133,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); return false; } finally @@ -160,7 +160,7 @@ public class PlayerVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java index 8a54b645b0..adfcec2ca5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java @@ -66,7 +66,7 @@ public abstract class L2ZoneRespawn extends L2ZoneType } default: { - _log.warning(getClass().getSimpleName() + ": Unknown location type: " + type); + LOGGER.warning(getClass().getSimpleName() + ": Unknown location type: " + type); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 3beea85891..a6790a61d9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public abstract class L2ZoneType extends ListenersContainer { - protected static final Logger _log = Logger.getLogger(L2ZoneType.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2ZoneType.class.getName()); private final int _id; protected L2ZoneForm _zone; @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - _log.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 043a66b6f4..33d3bb8723 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -113,7 +113,7 @@ public final class L2EffectZone extends L2ZoneType final String[] skillSplit = skill.split("-"); if (skillSplit.length != 2) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); } else { @@ -125,7 +125,7 @@ public final class L2EffectZone extends L2ZoneType { if (!skill.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/L2GameClient.java index 56940c6507..7cdbe1bb0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -63,7 +63,7 @@ import io.netty.channel.ChannelHandlerContext; public final class L2GameClient extends ChannelInboundHandler { protected static final Logger LOGGER = Logger.getLogger(L2GameClient.class.getName()); - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private final int _objectId; @@ -111,13 +111,13 @@ public final class L2GameClient extends ChannelInboundHandler final InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); _addr = address.getAddress(); _channel = ctx.channel(); - LOG_ACCOUNTING.finer("Client Connected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Connected: " + ctx.channel()); } @Override public void channelInactive(ChannelHandlerContext ctx) { - LOG_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); LoginServerThread.getInstance().sendLogout(getAccountName()); IdFactory.getInstance().releaseId(getObjectId()); @@ -339,7 +339,7 @@ public final class L2GameClient extends ChannelInboundHandler } } - LOG_ACCOUNTING.info("Delete, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Delete, " + objectId + ", " + this); return CharacterDeleteFailType.NONE; } @@ -362,7 +362,7 @@ public final class L2GameClient extends ChannelInboundHandler LOGGER.log(Level.SEVERE, "Error restoring character.", e); } - LOG_ACCOUNTING.info("Restore, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Restore, " + objectId + ", " + this); } public static void deleteCharByObjId(int objid) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/NpcStringId.java index decba5cecc..d8ee420713 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/NpcStringId.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { - private static final Logger _log = Logger.getLogger(NpcStringId.class.getName()); + private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; private static Map VALUES = new HashMap<>(); @@ -33892,7 +33892,7 @@ public final class NpcStringId } catch (Exception e) { - _log.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); + LOGGER.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Action.java index f92d2c5e23..6c3399eea7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Action.java @@ -154,7 +154,7 @@ public final class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - _log.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); + LOGGER.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 3159a555e3..1ffd75d20c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -58,7 +58,7 @@ public final class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - _log.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +68,7 @@ public final class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - _log.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + LOGGER.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/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 2471b37509..969aea0360 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.util.Util; @SuppressWarnings("unused") public final class CharacterCreate implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cSdddddddddddd private String _name; @@ -124,7 +124,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - _log.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -132,7 +132,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - _log.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -140,7 +140,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairColor > 3) || (_hairColor < 0)) { - _log.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -252,7 +252,7 @@ public final class CharacterCreate implements IClientIncomingPacket initNewChar(client, newChar); - LOG_ACCOUNTING.info("Created new character, " + newChar + ", " + client); + LOGGER_ACCOUNTING.info("Created new character, " + newChar + ", " + client); } private static boolean isValidName(String text) @@ -308,7 +308,7 @@ public final class CharacterCreate implements IClientIncomingPacket final L2ItemInstance item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - _log.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + LOGGER.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/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index cd62eefdba..1dab2d81f8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -75,7 +75,7 @@ public final class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error:", e); + LOGGER.log(Level.SEVERE, "Error:", e); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index c7b59f3d6d..3d0b8dfcb3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ServerClose; */ public class CharacterSelect implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cd private int _charSlot; @@ -175,7 +175,7 @@ public class CharacterSelect implements IClientIncomingPacket client.getActiveCharLock().unlock(); } - LOG_ACCOUNTING.info("Logged in, " + client); + LOGGER_ACCOUNTING.info("Logged in, " + client); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5c18755798..689f42e143 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public final class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = activeChar.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - _log.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } activeChar.stopMovie(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6dfb426f8b..35aca1fe55 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -141,7 +141,7 @@ public class EnterWorld implements IClientIncomingPacket final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { - _log.warning("EnterWorld failed! activeChar returned 'null'."); + LOGGER.warning("EnterWorld failed! activeChar returned 'null'."); Disconnection.of(client).defaultSequence(false); return; } @@ -172,7 +172,7 @@ public class EnterWorld implements IClientIncomingPacket // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) // { - // _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); + // LOGGER.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); // } if (Config.PVP_COLOR_SYSTEM_ENABLED && !Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 29a07243b9..7638c7332e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -43,9 +43,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("[T1:ExGetOnAirShip] x: " + _x); - _log.info("[T1:ExGetOnAirShip] y: " + _y); - _log.info("[T1:ExGetOnAirShip] z: " + _z); - _log.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + 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); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index 4f62846be3..c9f4c0b539 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index 472f1051b3..b0f55887ee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -27,5 +27,5 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger _log = Logger.getLogger(IClientIncomingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java index 8b2f68f220..d29291657e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class Logout implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -55,7 +55,7 @@ public final class Logout implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 33481d8d96..29b4d8f81b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -147,7 +147,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - _log.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -155,14 +155,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) { - _log.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - _log.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -190,7 +190,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - _log.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -355,7 +355,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -453,7 +453,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -616,7 +616,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c9e6a88cec..6d400a1191 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.KeyPacket; */ public final class ProtocolVersion implements IClientIncomingPacket { - private static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + private static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private int _version; @@ -51,7 +51,7 @@ public final class ProtocolVersion implements IClientIncomingPacket } else if (!Config.PROTOCOL_LIST.contains(_version)) { - LOG_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); + LOGGER_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); client.setProtocolOk(false); client.close(new KeyPacket(client.enableCrypt(), 0)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index f6f598bddf..f8258f7f20 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -106,7 +106,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 32000)) { Util.handleIllegalPlayerAction(activeChar, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - _log.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); return; } @@ -125,7 +125,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - _log.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -135,7 +135,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); return; } @@ -517,7 +517,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } default: { - _log.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index daaae05884..4feb5ae11d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -56,7 +56,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -80,7 +80,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - _log.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } @@ -90,11 +90,11 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); } else if (prevSkillLevel != (_level - 1)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index baddc853ee..b54bca60ed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -93,7 +93,7 @@ public final class RequestActionUse implements IClientIncomingPacket if (!(Arrays.binarySearch(allowedActions, _actionId) >= 0)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); + LOGGER.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); return; } } @@ -143,7 +143,7 @@ public final class RequestActionUse implements IClientIncomingPacket } default: { - _log.warning(activeChar.getName() + ": unhandled action type " + _actionId); + LOGGER.warning(activeChar.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 01c8b0c67f..138c70f9d8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -131,7 +131,7 @@ public final class RequestBlock implements IClientIncomingPacket } default: { - _log.info("Unknown 0xA9 block type: " + _type); + LOGGER.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 9efcd27f7c..e13a26f4ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -161,7 +161,7 @@ public final class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - _log.warning("ERROR, no price found .. wrong buylist ??"); + LOGGER.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index a85b1019cc..7621a7029e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -86,7 +86,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty bypass!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty bypass!"); Disconnection.of(client, activeChar).defaultSequence(false); return; } @@ -107,7 +107,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket bypassOriginId = activeChar.validateHtmlAction(_command); if (bypassOriginId == -1) { - _log.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); + LOGGER.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); return; } @@ -192,7 +192,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); } } else if (_command.startsWith("_match")) @@ -285,13 +285,13 @@ public final class RequestBypassToServer implements IClientIncomingPacket } else { - _log.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - _log.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); + LOGGER.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); if (activeChar.isGM()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 8d17f67975..61b88962de 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -61,7 +61,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket if (activeChar == null) { - _log.finer("RequestCrystalizeItem: activeChar was null"); + LOGGER.finer("RequestCrystalizeItem: activeChar was null"); return; } @@ -90,7 +90,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((activeChar.getRace() != Race.DWARF) && (activeChar.getClassId().ordinal() != 117) && (activeChar.getClassId().ordinal() != 55)) { - _log.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); + LOGGER.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); } return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index f48efc3a6d..9805ae3e39 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -171,7 +171,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not delete pet objectid: ", e); + LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 2c89d4fd7e..33c87254a1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -185,7 +185,7 @@ public final class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - _log.warning(msg); + LOGGER.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index ac44a0a77b..2bbdb8626a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -42,6 +42,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 27e73c4de3..94fc6eac8a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -74,7 +74,7 @@ public final class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - _log.warning("Wrong Cube Game Team ID: " + _team); + LOGGER.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index ca230610ed..ea96e75807 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -64,7 +64,7 @@ public final class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - _log.warning("Unknown Cube Game Answer ID: " + _answer); + LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index 2aac09d8a2..87679b1211 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -34,6 +34,6 @@ public final class RequestExFishRanking implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestExFishRanking"); + LOGGER.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 1690c6d2f0..412be1caa7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -87,7 +87,7 @@ public final class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 31e55b54f3..0937ce580d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -72,7 +72,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - _log.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 352bc99c12..c031e965ea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -43,7 +43,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - _log.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); + LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); if (client.getActiveChar() == null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index 8c3b8157b7..d480f5057e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -44,6 +44,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - _log.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + LOGGER.warning("Player " + activeChar + " (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/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index ffc9040acd..0feb646e91 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -79,7 +79,7 @@ public final class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index ee5433c9e0..186e2f91a4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -119,7 +119,7 @@ public final class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 07f79b8511..ce3ebea643 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -67,7 +67,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 4055e9b188..016c2378d4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -52,7 +52,7 @@ public final class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - _log.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); } client.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 6950da9b0c..a9704d4032 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -50,7 +50,7 @@ public final class RequestHennaItemRemoveInfo implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 2d53b32472..4a405e7538 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -75,7 +75,7 @@ public final class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - _log.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); + LOGGER.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); client.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index d8a598fa60..53afe57b35 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -49,20 +49,20 @@ public final class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - _log.warning("Player " + actor.getName() + " sent empty html link!"); + LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - _log.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - _log.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 3d797b889a..c8a621359f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -50,7 +50,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (activeChar.getObjectId() != _objectId) { - _log.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + LOGGER.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 1f6b539929..cab42128f7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public final class RequestMagicSkillUse implements IClientIncomingPacket activeChar.sendPacket(ActionFailed.STATIC_PACKET); if (_magicId > 0) { - _log.warning("Skill Id " + _magicId + " not found in player: " + activeChar); + LOGGER.warning("Skill Id " + _magicId + " not found in player: " + activeChar); } return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 0ab61c25b8..11ed417b33 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -72,7 +72,7 @@ public final class RequestOustPledgeMember implements IClientIncomingPacket final L2ClanMember member = clan.getClanMember(_target); if (member == null) { - _log.warning("Target (" + _target + ") is not member of the clan"); + LOGGER.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayerInstance().isInCombat()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index b703480e20..b87741c610 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -37,6 +37,6 @@ public final class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestPCCafeCouponUse: S: " + _str); + LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index aa71b73eb6..05962263f7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -119,7 +119,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -168,7 +168,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -176,7 +176,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 9ef482c27c..57d27eec76 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -136,7 +136,7 @@ public final class RequestPetUseItem implements IClientIncomingPacket else { activeChar.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - _log.warning("No item handler registered for itemId: " + item.getId()); + LOGGER.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index deef71c1ba..29ab10a108 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -74,7 +74,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - _log.severe("Error while saving petition feedback"); + LOGGER.severe("Error while saving petition feedback"); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 7e97a40c3f..432d30d9aa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -74,7 +74,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -153,7 +153,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket final L2MerchantInstance merchant = (target instanceof L2MerchantInstance) ? (L2MerchantInstance) target : null; if (merchant == null) { - _log.warning("Null merchant!"); + LOGGER.warning("Null merchant!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index b6f2892f96..a20bb3d197 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -160,7 +160,7 @@ public final class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - _log.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index d61109b205..d76415c39f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -144,7 +144,7 @@ public final class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9ab82245e8..01373d760d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -194,7 +194,7 @@ public final class RequestRefundItem implements IClientIncomingPacket final L2ItemInstance item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - _log.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); continue; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 8b253257c5..1a4ea38608 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack } else { - _log.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } activeChar.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 23c4edd13c..f8749dfd8b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class RequestRestart implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -58,7 +58,7 @@ public final class RequestRestart implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 7ba8a189b4..e08c984b59 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -91,7 +91,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else if (!activeChar.isDead()) { - _log.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); + LOGGER.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); return; } @@ -143,7 +143,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getHideoutId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CLANHALL); @@ -171,7 +171,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -194,7 +194,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getFortId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.FORTRESS); @@ -223,7 +223,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.SIEGEFLAG); @@ -233,7 +233,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if (!activeChar.isGM() && !activeChar.getInventory().haveItemForSelfResurrection()) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (activeChar.isGM() || activeChar.destroyItemByItemId("Feather", 10649, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13300, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13128, 1, activeChar, false)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9cbb114e88..e53df987df 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -323,14 +323,14 @@ public final class RequestSendPost implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - _log.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final L2ItemInstance newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - _log.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + LOGGER.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/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 092a91fe40..5e2215c60a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -54,17 +54,17 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((activeChar == null) || (castle == null)) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != activeChar.getClanId())) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); return; } else if (!activeChar.isClanLeader()) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); return; } else if (!castle.getIsTimeRegistrationOver()) @@ -81,12 +81,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index 5ab9bf7732..220b673807 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -109,7 +109,7 @@ public final class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - _log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); + LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -117,7 +117,7 @@ public final class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - _log.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); + LOGGER.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -224,7 +224,7 @@ public final class Say2 implements IClientIncomingPacket } else { - _log.info("No handler registered for ChatType: " + _type + " Player: " + client); + LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -271,7 +271,7 @@ public final class Say2 implements IClientIncomingPacket if (item == null) { - _log.info(client + " trying publish item which doesnt own! ID:" + id); + LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -279,7 +279,7 @@ public final class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - _log.info(client + " sent invalid publish item msg! ID:" + id); + LOGGER.info(client + " sent invalid publish item msg! ID:" + id); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 84eccf9f7a..2255ca3502 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -67,14 +67,14 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket activeChar.sendMessage("The command " + command.substring(6) + " does not exists!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 60c0402b18..237686ac3b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -128,7 +128,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -175,7 +175,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -187,7 +187,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 9c76eb1086..dc8836ed4b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -167,13 +167,13 @@ public final class SendWareHouseWithDrawList implements IClientIncomingPacket final L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final L2ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java index 5999d7d02c..8ae98bd315 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -272,7 +272,7 @@ public final class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(activeChar, item, _ctrlPressed)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java index 1441d46716..622d6d2d7f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java @@ -64,8 +64,8 @@ public class ValidatePosition implements IClientIncomingPacket if (Config.DEVELOPER) { - _log.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); - _log.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); + LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); + LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); } if ((_x == 0) && (_y == 0)) @@ -191,7 +191,7 @@ public class ValidatePosition implements IClientIncomingPacket { if (Config.DEVELOPER) { - _log.info(activeChar.getName() + ": Synchronizing position Server --> Client"); + LOGGER.info(activeChar.getName() + ": Synchronizing position Server --> Client"); } activeChar.sendPacket(new ValidateLocation(activeChar)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 8cf9b2f3b5..8cf139d7c4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -57,7 +57,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_durationType < 0) || (_durationType > 3)) { - _log.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 659b237448..5e0ad65f1a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -101,7 +101,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning(activeChar + ": tried to crystallize " + item.getItem()); + LOGGER.warning(activeChar + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index f3d9054f6a..213b230d0b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -102,7 +102,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); } } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 6165c3b460..2897338b82 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -101,7 +101,7 @@ public final class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not del friend objectid: ", e); + LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 29a252aa5e..94715a15c1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -94,7 +94,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index c51d4f158a..de2ad9cf73 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -77,7 +77,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - _log.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index a7553a343f..5d89208157 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -61,7 +61,7 @@ public final class RequestBRProductList implements IClientIncomingPacket } default: { - _log.warning(player + " send unhandled product list type: " + _type); + LOGGER.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index 15e8b936a5..7939daf42a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -71,7 +71,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { activeChar.sendMessage("That zone is not supported yet!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); return; } @@ -79,7 +79,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { activeChar.sendMessage("This zone is not handled yet!!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index 4c9c106a52..b6ac83ea82 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -60,7 +60,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket activeChar.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - _log.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); + LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java index eb24a578fb..9d28cd837c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java @@ -29,7 +29,7 @@ import com.l2jmobius.commons.network.BaseSendablePacket; */ public class BlowFishKey extends BaseSendablePacket { - private static Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param blowfishKey @@ -48,7 +48,7 @@ public class BlowFishKey extends BaseSendablePacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index d7f5a56cb6..4b509229e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -75,7 +75,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - _log.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); _html = html.substring(0, 17200); } @@ -93,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - _log.warning("missing html page " + path); + LOGGER.warning("missing html page " + path); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 16c17c043b..a06dff5ebc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -134,7 +134,7 @@ public abstract class AbstractMessagePacket> // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - _log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 58bbb84eef..2538126f0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { - private static Logger _log = Logger.getLogger(CharSelectionInfo.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); private final String _loginName; private final int _sessionId; private int _activeId; @@ -241,7 +241,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } return new CharSelectInfoPackage[0]; } @@ -266,7 +266,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); } } @@ -378,7 +378,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 36ef7cd289..1c046a085c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -46,7 +46,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 03c64d3f83..a90b288eb1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -44,7 +44,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 0616962b58..6cedcdd459 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -55,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - _log.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + LOGGER.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/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 8b2fe9aa5e..ba2ae9f9f1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger _log = Logger.getLogger(IClientOutgoingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); int[] PAPERDOLL_ORDER = new int[] { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index f21611bb50..d0f43d0ffe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -56,7 +56,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - _log.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 6397e049ac..401b7e072c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -58,7 +58,7 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - _log.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); + LOGGER.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 44a9997fb2..562b2ccd31 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -78,7 +78,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - _log.warning("Null owner for castle: " + _castle.getName()); + LOGGER.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 1082f31974..77c787e1be 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -55,7 +55,7 @@ public final class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_activeChar.getActiveWarehouse() == null) { - _log.warning("error while sending withdraw request to: " + _activeChar.getName()); + LOGGER.warning("error while sending withdraw request to: " + _activeChar.getName()); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/DateRange.java index 3b8acae352..1a16f0bd49 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/DateRange.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; */ public class DateRange { - protected static final Logger _log = Logger.getLogger(DateRange.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(DateRange.class.getName()); private final Date _startDate, _endDate; public DateRange(Date from, Date to) @@ -47,7 +47,7 @@ public class DateRange } catch (ParseException e) { - _log.log(Level.WARNING, "Invalid Date Format.", e); + LOGGER.log(Level.WARNING, "Invalid Date Format.", e); } } return new DateRange(null, null); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/ScriptDocument.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/ScriptDocument.java index eacfe5baf8..672c90e094 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/ScriptDocument.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/ScriptDocument.java @@ -33,7 +33,7 @@ import org.xml.sax.SAXException; */ public class ScriptDocument { - private static final Logger _log = Logger.getLogger(ScriptDocument.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScriptDocument.class.getName()); private Document _document; private final String _name; @@ -57,17 +57,17 @@ public class ScriptDocument { x = sxe.getException(); } - _log.warning(getClass().getSimpleName() + ": " + x.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + x.getMessage()); } catch (ParserConfigurationException pce) { // Parser with specified options can't be built - _log.log(Level.WARNING, "", pce); + LOGGER.log(Level.WARNING, "", pce); } catch (IOException ioe) { // I/O error - _log.log(Level.WARNING, "", ioe); + LOGGER.log(Level.WARNING, "", ioe); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 1779779829..8344576a3e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SecondaryPasswordAuth { - private final Logger _log = Logger.getLogger(SecondaryPasswordAuth.class.getName()); + private final Logger LOGGER = Logger.getLogger(SecondaryPasswordAuth.class.getName()); private final L2GameClient _activeClient; private String _password; @@ -96,7 +96,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); } } @@ -104,7 +104,7 @@ public class SecondaryPasswordAuth { if (passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -127,7 +127,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing password.", e); + LOGGER.log(Level.SEVERE, "Error while writing password.", e); return false; } _password = password; @@ -147,7 +147,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing wrong attempts.", e); + LOGGER.log(Level.SEVERE, "Error while writing wrong attempts.", e); return false; } return true; @@ -157,7 +157,7 @@ public class SecondaryPasswordAuth { if (!passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -185,7 +185,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); return false; } @@ -210,7 +210,7 @@ public class SecondaryPasswordAuth { LoginServerThread.getInstance().sendTempBan(_activeClient.getAccountName(), _activeClient.getConnectionAddress().getHostAddress(), SecondaryAuthData.getInstance().getBanTime()); LoginServerThread.getInstance().sendMail(_activeClient.getAccountName(), "SATempBan", _activeClient.getConnectionAddress().getHostAddress(), Integer.toString(SecondaryAuthData.getInstance().getMaxAttempts()), Long.toString(SecondaryAuthData.getInstance().getBanTime()), SecondaryAuthData.getInstance().getRecoveryLink()); - _log.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); + LOGGER.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); insertWrongAttempt(0); _activeClient.close(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_BAN, SecondaryAuthData.getInstance().getMaxAttempts())); } @@ -258,11 +258,11 @@ public class SecondaryPasswordAuth } catch (NoSuchAlgorithmException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); } catch (UnsupportedEncodingException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Encoding"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Encoding"); } return null; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index 9f26c91ac6..49f8a70c08 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; */ public class AttackStanceTaskManager { - protected static final Logger _log = Logger.getLogger(AttackStanceTaskManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AttackStanceTaskManager.class.getName()); protected static final Map _attackStanceTasks = new ConcurrentHashMap<>(); @@ -132,7 +132,7 @@ public class AttackStanceTaskManager catch (Exception e) { // Unless caught here, players remain in attack positions. - _log.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Broadcast.java index 419eb6295a..dfaa95d5d0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Broadcast.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.RelationChanged; */ public final class Broadcast { - private static Logger _log = Logger.getLogger(Broadcast.class.getName()); + private static Logger LOGGER = Logger.getLogger(Broadcast.class.getName()); /** * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character that have the Character targeted.
@@ -101,7 +101,7 @@ public final class Broadcast } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } }); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Evolve.java index 7fae394d24..66a22f62fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/Evolve.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class Evolve { - protected static final Logger _log = Logger.getLogger(Evolve.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Evolve.class.getName()); public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) { @@ -287,7 +287,7 @@ public final class Evolve } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } @@ -314,7 +314,7 @@ public final class Evolve } catch (Throwable e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java index f005fca2ea..7c4f9c2185 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -40,7 +40,7 @@ public final class FloodProtectorAction /** * Logger */ - private static final Logger _log = Logger.getLogger(FloodProtectorAction.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectorAction.class.getName()); /** * Client for this instance of flood protector. */ @@ -94,7 +94,7 @@ public final class FloodProtectorAction if ((curTick < _nextGameTick) || _punishmentInProgress) { - if (_config.LOG_FLOODING && !_logged && _log.isLoggable(Level.WARNING)) + if (_config.LOG_FLOODING && !_logged && LOGGER.isLoggable(Level.WARNING)) { log(" called command ", command, " ~", String.valueOf((_config.FLOOD_PROTECTION_INTERVAL - (_nextGameTick - curTick)) * GameTimeController.MILLIS_IN_TICK), " ms after previous command"); _logged = true; @@ -124,7 +124,7 @@ public final class FloodProtectorAction return false; } - if ((_count.get() > 0) && _config.LOG_FLOODING && _log.isLoggable(Level.WARNING)) + if ((_count.get() > 0) && _config.LOG_FLOODING && LOGGER.isLoggable(Level.WARNING)) { log(" issued ", String.valueOf(_count), " extra requests within ~", String.valueOf(_config.FLOOD_PROTECTION_INTERVAL * GameTimeController.MILLIS_IN_TICK), " ms"); } @@ -142,7 +142,7 @@ public final class FloodProtectorAction { Disconnection.of(_client).defaultSequence(false); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log("kicked for flooding"); } @@ -154,7 +154,7 @@ public final class FloodProtectorAction private void banAccount() { PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -176,7 +176,7 @@ public final class FloodProtectorAction PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" jailed for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -238,6 +238,6 @@ public final class FloodProtectorAction Arrays.stream(lines).forEach(output::append); - _log.warning(output.toString()); + LOGGER.warning(output.toString()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/GMAudit.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/GMAudit.java index c2ee25069b..c2a5593953 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/GMAudit.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/GMAudit.java @@ -31,7 +31,7 @@ import com.l2jmobius.Config; */ public class GMAudit { - private static final Logger _log = Logger.getLogger(GMAudit.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GMAudit.class.getName()); static { new File("log/GMAudit").mkdirs(); @@ -61,7 +61,7 @@ public class GMAudit } catch (IOException e) { - _log.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); + LOGGER.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 7394f489e8..ecc40e644b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public final class OfflineTradeUtil { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private OfflineTradeUtil() { @@ -145,7 +145,7 @@ public final class OfflineTradeUtil } Disconnection.of(player).storeMe().close(false); - LOG_ACCOUNTING.info("Entering offline mode, " + client); + LOGGER_ACCOUNTING.info("Entering offline mode, " + client); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/FloodProtectedListener.java index df39b38769..d046a0f65c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import com.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger _log = Logger.getLogger(FloodProtectedListener.class.getName()); + private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map _floodProtection = new ConcurrentHashMap<>(); private ServerSocket _serverSocket; @@ -70,7 +70,7 @@ public abstract class FloodProtectedListener extends Thread fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) { - _log.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); + LOGGER.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); } fConnection.isFlooding = true; continue; @@ -78,7 +78,7 @@ public abstract class FloodProtectedListener extends Thread if (fConnection.isFlooding) // if connection was flooding server but now passed the check { fConnection.isFlooding = false; - _log.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); + LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } fConnection.lastConnection = System.currentTimeMillis(); } @@ -102,7 +102,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException io) { - _log.log(Level.INFO, "", io); + LOGGER.log(Level.INFO, "", io); } break; } @@ -145,7 +145,7 @@ public abstract class FloodProtectedListener extends Thread } else { - _log.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); + LOGGER.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); } } @@ -157,7 +157,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java index 767e0b2326..78eadc9019 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters; */ public class GameServerThread extends Thread { - protected static final Logger _log = Logger.getLogger(GameServerThread.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GameServerThread.class.getName()); private final Socket _connection; private InputStream _in; private OutputStream _out; @@ -69,7 +69,7 @@ public class GameServerThread extends Thread _connectionIPAddress = _connection.getInetAddress().getHostAddress(); if (GameServerThread.isBannedGameserverIP(_connectionIPAddress)) { - _log.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); + LOGGER.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); forceClose(LoginServerFail.REASON_IP_BANNED); // ensure no further processing for this connection return; @@ -92,7 +92,7 @@ public class GameServerThread extends Thread if ((lengthHi < 0) || _connection.isClosed()) { - _log.finer("LoginServerThread: Login terminated the connection."); + LOGGER.finer("LoginServerThread: Login terminated the connection."); break; } @@ -110,7 +110,7 @@ public class GameServerThread extends Thread if (receivedBytes != (length - 2)) { - _log.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); + LOGGER.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); break; } @@ -119,7 +119,7 @@ public class GameServerThread extends Thread checksumOk = NewCrypt.verifyChecksum(data); if (!checksumOk) { - _log.warning("Incorrect packet checksum, closing connection (LS)"); + LOGGER.warning("Incorrect packet checksum, closing connection (LS)"); return; } @@ -130,14 +130,14 @@ public class GameServerThread extends Thread { final String serverName = getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"; final String msg = "GameServer " + serverName + ": Connection lost: " + e.getMessage(); - _log.info(msg); + LOGGER.info(msg); } finally { if (isAuthed()) { _gsi.setDown(); - _log.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); + LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); @@ -185,7 +185,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); + LOGGER.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); } } @@ -209,7 +209,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final ScrambledKeyPair pair = LoginController.getInstance().getScrambledRSAKeyPair(); _privateKey = (RSAPrivateKey) pair.getPrivateKey(); @@ -241,7 +241,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.severe("IOException while sending packet " + sl.getClass().getSimpleName()); + LOGGER.severe("IOException while sending packet " + sl.getClass().getSimpleName()); } } @@ -265,7 +265,7 @@ public class GameServerThread extends Thread */ public void setGameHosts(String[] hosts) { - _log.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); + LOGGER.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); _gsi.clearServerAddresses(); for (int i = 0; i < hosts.length; i += 2) @@ -276,13 +276,13 @@ public class GameServerThread extends Thread } catch (Exception e) { - _log.warning("Couldn't resolve hostname \"" + e + "\""); + LOGGER.warning("Couldn't resolve hostname \"" + e + "\""); } } for (String s : _gsi.getServerAddresses()) { - _log.info(s); + LOGGER.info(s); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/L2LoginServer.java index bad76dd97c..b87afbb356 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/L2LoginServer.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; */ public final class L2LoginServer { - private final Logger _log = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; private static L2LoginServer _instance; @@ -77,7 +77,7 @@ public final class L2LoginServer } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Load Config @@ -92,7 +92,7 @@ public final class L2LoginServer } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); System.exit(1); } @@ -104,11 +104,11 @@ public final class L2LoginServer { _gameServerListener = new GameServerListener(); _gameServerListener.start(); - _log.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); + LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); } catch (IOException e) { - _log.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); System.exit(1); } @@ -148,7 +148,7 @@ public final class L2LoginServer } catch (NumberFormatException nfe) { - _log.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); return; } } @@ -159,25 +159,25 @@ public final class L2LoginServer } catch (UnknownHostException e) { - _log.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); } }); //@formatter:on } catch (IOException e) { - _log.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); } - _log.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); + LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); } else { - _log.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); + LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); } if (Config.LOGIN_SERVER_SCHEDULE_RESTART) { - _log.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); + LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); _restartLoginServer = new LoginServerRestart(); _restartLoginServer.setDaemon(true); _restartLoginServer.start(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/LoginController.java index ff547092da..a896c7fd7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/LoginController.java @@ -51,7 +51,7 @@ import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason public class LoginController { - protected static final Logger _log = Logger.getLogger(LoginController.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(LoginController.class.getName()); private static LoginController _instance; @@ -78,7 +78,7 @@ public class LoginController private LoginController() throws GeneralSecurityException { - _log.info("Loading LoginController..."); + LOGGER.info("Loading LoginController..."); _keyPairs = new ScrambledKeyPair[10]; _blowfishKeyGenerator = KeyGenerator.getInstance("Blowfish"); @@ -91,7 +91,7 @@ public class LoginController _keyPairs[i] = new ScrambledKeyPair(rsaKeyPairGenerator.generateKeyPair()); } - _log.info("Cached 10 KeyPairs for RSA communication."); + LOGGER.info("Cached 10 KeyPairs for RSA communication."); final Thread purge = new PurgeThread(); purge.setDaemon(true); @@ -156,7 +156,7 @@ public class LoginController addBanForAddress(addr, Config.LOGIN_BLOCK_AFTER_BAN * 1000); // we need to clear the failed login attempts here, so after the ip ban is over the client has another 5 attempts clearFailedLoginAttemps(addr); - _log.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); + LOGGER.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); } } @@ -218,16 +218,16 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); return null; } - _log.info("Auto created account '" + login + "'."); + LOGGER.info("Auto created account '" + login + "'."); return retriveAccountInfo(addr, login, password, false); } catch (Exception e) { - _log.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); return null; } } @@ -301,7 +301,7 @@ public class LoginController if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); - _log.info("Removed expired ip address ban " + address.getHostAddress() + "."); + LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); return false; } return true; @@ -414,7 +414,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); } } return loginOk; @@ -433,7 +433,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); } } @@ -452,7 +452,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); } } @@ -532,13 +532,13 @@ public class LoginController { if (!ipWhiteList.isEmpty() && !ipWhiteList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); return false; } if (!ipBlackList.isEmpty() && ipBlackList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); return false; } } @@ -558,7 +558,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not finish login process!", e); + LOGGER.log(Level.WARNING, "Could not finish login process!", e); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java index 83ad61827b..bfa7e9dc02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class L2JGameServerPacketHandler { - protected static Logger _log = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); + protected static Logger LOGGER = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); public enum GameServerState { @@ -65,7 +65,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -83,7 +83,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -146,7 +146,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2LoginClient.java index c4f45ea59b..da20164f21 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -46,7 +46,7 @@ import io.netty.channel.ChannelHandlerContext; */ public final class L2LoginClient extends ChannelInboundHandler { - private static final Logger _log = Logger.getLogger(L2LoginClient.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2LoginClient.class.getName()); // Crypt private final ScrambledKeyPair _scrambledPair; @@ -105,7 +105,7 @@ public final class L2LoginClient extends ChannelInboundHandler } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java index 1cd1aceac3..e48d751a7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java @@ -46,7 +46,7 @@ import com.l2jmobius.loginserver.network.serverpackets.ServerList; */ public class RequestAuthLogin implements IIncomingPacket { - private static Logger _log = Logger.getLogger(RequestAuthLogin.class.getName()); + private static Logger LOGGER = Logger.getLogger(RequestAuthLogin.class.getName()); private final byte[] _raw1 = new byte[128]; private final byte[] _raw2 = new byte[128]; @@ -89,7 +89,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (GeneralSecurityException e) { - _log.log(Level.INFO, "", e); + LOGGER.log(Level.INFO, "", e); return; } @@ -108,7 +108,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java index 6abfe18518..a68b2053a7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java @@ -32,7 +32,7 @@ import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerSt */ public class BlowFishKey extends BaseRecievePacket { - protected static final Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param decrypt @@ -67,7 +67,7 @@ public class BlowFishKey extends BaseRecievePacket } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java index 03ff8df8d3..4e0c492ffa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java @@ -27,7 +27,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class ChangeAccessLevel extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangeAccessLevel.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangeAccessLevel.class.getName()); /** * @param decrypt @@ -40,6 +40,6 @@ public class ChangeAccessLevel extends BaseRecievePacket final String account = readS(); LoginController.getInstance().setAccountAccessLevel(account, level); - _log.info("Changed " + account + " access level to " + level); + LOGGER.info("Changed " + account + " access level to " + level); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java index d4c10be532..69ba99271d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java @@ -35,7 +35,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ChangePassword extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangePassword.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangePassword.class.getName()); private static GameServerThread gst = null; public ChangePassword(byte[] decrypt) @@ -103,7 +103,7 @@ public class ChangePassword extends BaseRecievePacket passUpdated = ps.executeUpdate(); } - _log.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); + LOGGER.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); if (passUpdated > 0) { gst.ChangePasswordResponse((byte) 1, characterName, "You have successfully changed your password!"); @@ -120,7 +120,7 @@ public class ChangePassword extends BaseRecievePacket } catch (Exception e) { - _log.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); + LOGGER.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java index 2154becbb5..153a4cd86d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class GameServerAuth extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(GameServerAuth.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GameServerAuth.class.getName()); GameServerThread _server; private final byte[] _hexId; private final int _desiredId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java index 194d82d565..baa6528090 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerLogout extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerLogout.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerLogout.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java index 69c263628b..542848f6e6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class PlayerTracert extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerTracert.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerTracert.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java index 1a76467686..f9a24a80d8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java @@ -31,7 +31,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class RequestTempBan extends BaseRecievePacket { - private static final Logger _log = Logger.getLogger(RequestTempBan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RequestTempBan.class.getName()); private final String _accountName; @SuppressWarnings("unused") @@ -69,7 +69,7 @@ public class RequestTempBan extends BaseRecievePacket } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } try diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java index 6c7aed04d5..155d19688d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java @@ -28,7 +28,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ServerStatus extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ServerStatus.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ServerStatus.class.getName()); public static final int SERVER_LIST_STATUS = 0x01; public static final int SERVER_TYPE = 0x02; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java index cc2a6c0c2f..2a71996141 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -61,7 +61,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; */ public final class ServerList implements IOutgoingPacket { - protected static final Logger _log = Logger.getLogger(ServerList.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ServerList.class.getName()); private final List _servers; private final int _lastServer; @@ -89,7 +89,7 @@ public final class ServerList implements IOutgoingPacket } catch (UnknownHostException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); _ip = new byte[4]; _ip[0] = 127; _ip[1] = 0; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java index 593e01a15d..887e4f715c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; */ public class IPv4Filter implements Runnable { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final HashMap _ipFloodMap; private static final long SLEEP_TIME = 5000; @@ -69,7 +69,7 @@ public class IPv4Filter implements Runnable final InetAddress addr = sc.socket().getInetAddress(); if (!(addr instanceof Inet4Address)) { - _log.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); + LOGGER.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/AbstractNpcAI.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/AbstractNpcAI.java index df220882f6..5163520584 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/AbstractNpcAI.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/AbstractNpcAI.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public abstract class AbstractNpcAI extends Quest { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); public AbstractNpcAI() { diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 1f39611ed2..bd2ea79b44 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -628,7 +628,7 @@ public final class Antharas extends AbstractNpcAI { if (!zone.isCharacterInZone(attacker) || (getStatus() != IN_FIGHT)) { - _log.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!"); attacker.teleToLocation(80464, 152294, -3534); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index c4cec24dce..f4589101b0 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1245,7 +1245,7 @@ public final class CastleChamberlain extends AbstractNpcAI } default: { - _log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 6c1d0c7c68..3e8e690ed0 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -60,7 +60,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler "watchmatch", "arenachange" }; - private static final Logger _LOG = Logger.getLogger(OlyManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlyManager.class.getName()); private OlyManager() { @@ -351,7 +351,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler final List spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns(); if (spectatorSpawns.isEmpty()) { - _LOG.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); + LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); @@ -362,7 +362,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler } catch (Exception e) { - _LOG.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 4ca3d1df97..813358bd0c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -88,7 +88,7 @@ public final class Elpies extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started because custom NPC table is disabled!"); + LOGGER.info(getName() + ": Event can't be started because custom NPC table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index e8d253c2c9..bd418adefc 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -95,7 +95,7 @@ public final class Rabbits extends Event // Check starting conditions if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom NPCs are disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPCs are disabled!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Race/Race.java index 19f2f42bae..7756d0d55e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/events/Race/Race.java @@ -121,7 +121,7 @@ public final class Race extends Event // Check Custom Table - we use custom NPCs if (!Config.CUSTOM_NPC_DATA) { - _log.info(getName() + ": Event can't be started, because custom npc table is disabled!"); + LOGGER.info(getName() + ": Event can't be started, because custom npc table is disabled!"); eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/listeners/ListenerTest.java index 73b858e854..59dcb31683 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -63,7 +63,7 @@ public class ListenerTest extends AbstractNpcAI // Manual listener registration Containers.Global().addListener(new ConsumerEventListener(Containers.Global(), EventType.ON_PLAYER_DLG_ANSWER, (OnPlayerDlgAnswer event) -> { - _log.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId()); }, this)); } @@ -73,7 +73,7 @@ public class ListenerTest extends AbstractNpcAI */ private void onAttackableAttack(OnAttackableAttack event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill()); } /** @@ -88,7 +88,7 @@ public class ListenerTest extends AbstractNpcAI @Id(22228) private void onCreatureKill(OnCreatureDeath event) { - _log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); + LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget()); } /** @@ -101,7 +101,7 @@ public class ListenerTest extends AbstractNpcAI @Range(from = 1, to = 9) private void onSiegeStart(OnCastleSiegeStart event) { - _log.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); + LOGGER.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!"); } /** @@ -114,7 +114,7 @@ public class ListenerTest extends AbstractNpcAI @Id(5575) private void onItemCreate(OnItemCreate event) { - _log.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); + LOGGER.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference()); } /** @@ -152,7 +152,7 @@ public class ListenerTest extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void OnPlayerLogin(OnPlayerLogin event) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!"); } /** @@ -170,7 +170,7 @@ public class ListenerTest extends AbstractNpcAI { if (event.getTarget().isGM()) { - _log.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); + LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!"); return new TerminateReturn(true, true, true); } return null; diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/MasterHandler.java index 9afcf3bb83..0e053d06ac 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/MasterHandler.java @@ -341,7 +341,7 @@ import handlers.voicedcommandhandlers.StatsVCmd; */ public class MasterHandler { - private static final Logger _log = Logger.getLogger(MasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MasterHandler.class.getName()); private static final IHandler[] LOAD_INSTANCES = { @@ -680,7 +680,7 @@ public class MasterHandler public static void main(String[] args) { - _log.info("Loading Handlers..."); + LOGGER.info("Loading Handlers..."); final Map, Method> registerHandlerMethods = new HashMap<>(); for (IHandler loadInstance : LOAD_INSTANCES) @@ -697,7 +697,7 @@ public class MasterHandler registerHandlerMethods.entrySet().stream().filter(e -> e.getValue() == null).forEach(e -> { - _log.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); + LOGGER.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."); }); for (Class classes[] : HANDLERS) @@ -722,7 +722,7 @@ public class MasterHandler } catch (Exception e) { - _log.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); + LOGGER.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e); continue; } } @@ -759,9 +759,9 @@ public class MasterHandler for (IHandler loadInstance : LOAD_INSTANCES) { - _log.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); + LOGGER.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers"); } - _log.info("Handlers Loaded..."); + LOGGER.info("Handlers Loaded..."); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java index 2c0368fa04..6239aa2af9 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java @@ -34,7 +34,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target; if (staticObject.getType() < 0) { - _log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); + LOGGER.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId()); } // Check if the L2PcInstance already target the L2NpcInstance diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7b78de63fe..1ead5e9548 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminAdmin implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminAdmin.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminAdmin.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -121,7 +121,7 @@ public class AdminAdmin implements IAdminCommandHandler } catch (Exception e) { - _log.warning("An error occured while ending olympiad: " + e); + LOGGER.warning("An error occured while ending olympiad: " + e); } activeChar.sendMessage("Heroes formed."); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 3eaefdfc12..064f1c9519 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.UserInfo; */ public class AdminEditChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEditChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEditChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -218,7 +218,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set reputation error: " + e); + LOGGER.warning("Set reputation error: " + e); } activeChar.sendMessage("Usage: //setreputation "); } @@ -261,7 +261,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pk error: " + e); + LOGGER.warning("Set pk error: " + e); } activeChar.sendMessage("Usage: //setpk "); } @@ -291,7 +291,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set pvp error: " + e); + LOGGER.warning("Set pvp error: " + e); } activeChar.sendMessage("Usage: //setpvp "); } @@ -321,7 +321,7 @@ public class AdminEditChar implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set Fame error: " + e); + LOGGER.warning("Set Fame error: " + e); } activeChar.sendMessage("Usage: //setfame "); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 1634710c12..2de1bf7bd5 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; */ public class AdminEnchant implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminEnchant.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminEnchant.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -146,7 +146,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a new enchant value."); } @@ -154,7 +154,7 @@ public class AdminEnchant implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Set enchant error: " + e); + LOGGER.warning("Set enchant error: " + e); } activeChar.sendMessage("Please specify a valid new enchant value."); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index 5acf20c5b6..1da9a18c9d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminHeal implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_heal" @@ -57,7 +57,7 @@ public class AdminHeal implements IAdminCommandHandler { if (Config.DEVELOPER) { - _log.warning("Heal error: " + e); + LOGGER.warning("Heal error: " + e); } activeChar.sendMessage("Incorrect target/radius specified."); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java index 549035d177..5ab19d4b39 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminMenu implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminMenu.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminMenu.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -112,7 +112,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_recall_clan_menu")) @@ -141,7 +141,7 @@ public class AdminMenu implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } else if (command.startsWith("admin_goto_char_menu")) @@ -190,7 +190,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -207,7 +207,7 @@ public class AdminMenu implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5b95022983..cd89f2cc84 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class AdminPunishment implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPunishment.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPunishment.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -86,7 +86,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing"); } } else @@ -149,7 +149,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing"); } break; } @@ -186,7 +186,7 @@ public class AdminPunishment implements IAdminCommandHandler } else { - _log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); + LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing"); } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java index 934e877d84..764ab77c25 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminRepairChar.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminRepairChar implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRepairChar.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminRepairChar.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -101,7 +101,7 @@ public class AdminRepairChar implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "could not repair char:", e); + LOGGER.log(Level.WARNING, "could not repair char:", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java index dfd8ab322b..52c768b06a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShop.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList; */ public class AdminShop implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShop.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShop.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -106,7 +106,7 @@ public class AdminShop implements IAdminCommandHandler } catch (Exception e) { - _log.warning("admin buylist failed:" + command); + LOGGER.warning("admin buylist failed:" + command); } final ProductList buyList = BuyListData.getInstance().getBuyList(val); @@ -117,7 +117,7 @@ public class AdminShop implements IAdminCommandHandler } else { - _log.warning("no buylist with id:" + val); + LOGGER.warning("no buylist with id:" + val); activeChar.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index a569d1fca6..780c3b0088 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.QuestList; */ public class AdminShowQuests implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminShowQuests.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminShowQuests.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -313,7 +313,7 @@ public class AdminShowQuests implements IAdminCommandHandler catch (Exception e) { actor.sendMessage("There was an error."); - _log.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java index ea51fdd106..93293c80e2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class AdminSkill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminSkill.class.getName()); + private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -526,7 +526,7 @@ public class AdminSkill implements IAdminCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } if (skill != null) { diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java index bf52975d48..603c953427 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class AdminSpawn implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSpawn.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -377,17 +377,17 @@ public class AdminSpawn implements IAdminCommandHandler default: case 0: { - _log.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); + LOGGER.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),"); break; } case 1: { - _log.info(""); + LOGGER.info(""); break; } case 2: { - _log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); + LOGGER.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },"); break; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java index 880aba40c1..a818e7f3d3 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminSummon implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminSummon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName()); public static final String[] ADMIN_COMMANDS = { @@ -69,7 +69,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); @@ -81,7 +81,7 @@ public class AdminSummon implements IAdminCommandHandler if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!"); return false; } final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand); diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index a088b5f7f0..27bcfe9dd8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -50,7 +50,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminTeleport implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminTeleport.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminTeleport.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -525,7 +525,7 @@ public class AdminTeleport implements IAdminCommandHandler if (template1 == null) { activeChar.sendMessage("Incorrect monster template."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template."); return; } @@ -533,7 +533,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect monster spawn."); - _log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn."); return; } final int respawnTime = spawn.getRespawnDelay() / 1000; @@ -575,7 +575,7 @@ public class AdminTeleport implements IAdminCommandHandler if (spawn == null) { activeChar.sendMessage("Incorrect raid spawn."); - _log.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); + LOGGER.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn."); return; } DBSpawnManager.getInstance().deleteSpawn(spawn, true); diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java index a02258ac82..6661cf897c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminUnblockIp.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminUnblockIp implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminUnblockIp.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminUnblockIp.class.getName()); private static final String[] ADMIN_COMMANDS = { @@ -68,7 +68,7 @@ public class AdminUnblockIp implements IAdminCommandHandler private boolean unblockIp(String ipAddress, L2PcInstance activeChar) { // LoginServerThread.getInstance().unBlockip(ipAddress); - _log.warning("IP removed by GM " + activeChar.getName()); + LOGGER.warning("IP removed by GM " + activeChar.getName()); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index d5baa52a73..fd68914b26 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -64,7 +64,7 @@ import ai.AbstractNpcAI; */ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler { - private static final Logger _log = Logger.getLogger(AdminPathNode.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AdminPathNode.class.getName()); private final Map _zones = new ConcurrentHashMap<>(); private static final String[] COMMANDS = @@ -484,7 +484,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler catch (Exception e) { activeChar.sendMessage("Failed writing the dump: " + e.getMessage()); - _log.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Augment.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Augment.java index 6f3cdd671a..015cb20ce8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Augment.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Augment.java @@ -57,7 +57,7 @@ public class Augment implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Buy.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Buy.java index dedd804298..5084dc1239 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Buy.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Buy.java @@ -54,7 +54,7 @@ public class Buy implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 77244e8a99..b937970ce0 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -112,7 +112,7 @@ public class ClanWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } } return false; diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 383b2ac65a..648a840357 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -54,7 +54,7 @@ public class EventEngine implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 5bb42fb02d..2cc2c9cd2e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -121,7 +121,7 @@ public class ItemAuctionLink implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 1ee7660160..fc06d1b5ea 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -35,13 +35,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty link html!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - _log.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java index 15c9a87b30..bd019c6c2b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java @@ -59,7 +59,7 @@ public class Multisell implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 27bbae841c..8d2b77c311 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -62,7 +62,7 @@ public class NpcViewMod implements IBypassHandler if (!st.hasMoreTokens()) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -101,7 +101,7 @@ public class NpcViewMod implements IBypassHandler { if (st.countTokens() < 2) { - _log.warning("Bypass[NpcViewMod] used without enough parameters."); + LOGGER.warning("Bypass[NpcViewMod] used without enough parameters."); return false; } @@ -124,7 +124,7 @@ public class NpcViewMod implements IBypassHandler } catch (IllegalArgumentException e) { - _log.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); + LOGGER.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString); return false; } break; @@ -571,7 +571,7 @@ public class NpcViewMod implements IBypassHandler String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/DropList.htm"); if (html == null) { - _log.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); + LOGGER.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found."); return; } html = html.replaceAll("%name%", npc.getName()); diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 49825fbf68..9b177fff8d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -113,7 +113,7 @@ public class Observation implements IBypassHandler } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java index 6c16720329..0597ff6ab7 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java @@ -66,7 +66,7 @@ public class PlayerHelp implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index d6c31d5495..59491ae669 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -67,7 +67,7 @@ public class PrivateWarehouse implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 40de431ce5..fd1fe934bd 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -63,7 +63,7 @@ public class Wear implements IBypassHandler } catch (Exception e) { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); } return false; } @@ -73,7 +73,7 @@ public class Wear implements IBypassHandler final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index faa4b3ef97..d74fd3a648 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -39,7 +39,7 @@ public final class AttackTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": this effect must have parameters!"); + LOGGER.warning(getClass().getSimpleName() + ": this effect must have parameters!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 675e1023d2..3b0c1fb514 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -74,7 +74,7 @@ public final class CallSkill extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 924b08d8f7..b582a0e29e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -66,7 +66,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } return skill.isToggle(); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 36bed01887..9b3af7d06a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -39,7 +39,7 @@ public final class DefenceTrait extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); return; } @@ -57,11 +57,11 @@ public final class DefenceTrait extends AbstractEffect } catch (NumberFormatException e) { - _log.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); + LOGGER.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found."); } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); + LOGGER.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey()); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index b6d50cd89c..8fb26ea974 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -48,7 +48,7 @@ public final class Disarmor extends AbstractEffect _slot = ItemTable.SLOTS.getOrDefault(slot, L2Item.SLOT_NONE); if (_slot == L2Item.SLOT_NONE) { - _log.severe("Unknown bodypart slot for effect: " + slot); + LOGGER.severe("Unknown bodypart slot for effect: " + slot); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index adf474fe77..dbc72f8b13 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -59,7 +59,7 @@ public final class Restoration extends AbstractEffect if ((_itemId <= 0) || (_itemCount <= 0)) { effected.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE); - _log.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); + LOGGER.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java index f9a102f869..edcd13b407 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -97,7 +97,7 @@ public final class Summon extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 0fab6deaee..c73eb71458 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -38,7 +38,7 @@ public final class SummonAgathion extends AbstractEffect { if (params.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": must have parameters."); + LOGGER.warning(getClass().getSimpleName() + ": must have parameters."); } _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7ad2935324..d745528a40 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -64,7 +64,7 @@ public final class SummonCubic extends AbstractEffect if (_cubicId < 0) { - _log.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId()); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index b10d5cb341..d88f72ee89 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -66,7 +66,7 @@ public class SummonHallucination extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -79,7 +79,7 @@ public class SummonHallucination extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 03d7f27857..15c94c90a2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -87,7 +87,7 @@ public final class SummonMulti extends AbstractEffect if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel()) { summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1)); - _log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); } else { diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index ae4549f39f..5779663ae6 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -80,7 +80,7 @@ public final class SummonNpc extends AbstractEffect if ((_npcId <= 0) || (_npcCount <= 0)) { - _log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId()); return; } @@ -93,7 +93,7 @@ public final class SummonNpc extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); + LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId()); return; } @@ -162,7 +162,7 @@ public final class SummonNpc extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); + LOGGER.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5d8b92393c..a771a8e4cc 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -75,14 +75,14 @@ public final class SummonPet extends AbstractEffect final PetItemHolder holder = player.removeScript(PetItemHolder.class); if (holder == null) { - _log.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); + LOGGER.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable()); return; } final L2ItemInstance collar = holder.getItem(); if (player.getInventory().getItemByObjectId(collar.getObjectId()) != collar) { - _log.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); + LOGGER.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns."); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 4528a3f91b..984c53a5ab 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -57,7 +57,7 @@ public final class SummonTrap extends AbstractEffect if (_npcId <= 0) { - _log.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId()); return; } @@ -76,7 +76,7 @@ public final class SummonTrap extends AbstractEffect final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId); if (npcTemplate == null) { - _log.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); + LOGGER.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId()); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index c3a9b08bde..8d18d6fecc 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -110,7 +110,7 @@ public final class Synergy extends AbstractEffect } else { - _log.warning("Skill not found effect called from " + skill); + LOGGER.warning("Skill not found effect called from " + skill); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 32ac16aa59..da879def26 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -146,7 +146,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index c9ce6cc000..b7d80e1e34 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -64,7 +64,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -81,7 +81,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 351e687f0f..2ce0c6758c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -88,7 +88,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c950983e3d..1c010ed094 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -91,7 +91,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 7a474f5b8d..956ef40eed 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -102,7 +102,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index fefd166e0d..014142ca85 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -114,7 +114,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 23a72039a7..1f0c32d50d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -97,7 +97,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType); if (targetHandler == null) { - _log.warning("Handler for target type: " + _targetType + " does not exist."); + LOGGER.warning("Handler for target type: " + _targetType + " does not exist."); return; } @@ -124,7 +124,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } catch (Exception e) { - _log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e); } if ((target != null) && target.isCharacter()) diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 9c5277f5f4..c01713088c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -90,7 +90,7 @@ public class BeastSoulShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index ac1c881ba5..92a3a94e76 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -92,7 +92,7 @@ public class BeastSpiritShot implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index a053b95a9d..e3b723050d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -52,7 +52,7 @@ public class BlessedSoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9800a7e664..52f772757a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -48,7 +48,7 @@ public class BlessedSpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index e7c5629cc7..e1df0bdc7a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -59,7 +59,7 @@ public class EventItem implements IItemHandler } default: { - _log.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); + LOGGER.warning("EventItemHandler: Item with id: " + itemId + " is not handled"); } } return used; @@ -103,7 +103,7 @@ public class EventItem implements IItemHandler }); return true; } - _log.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); + LOGGER.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena"); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index c57f85169b..479d0b66ab 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -54,7 +54,7 @@ public class ExtractableItems implements IItemHandler final List exitems = etcitem.getExtractableItems(); if (exitems == null) { - _log.info("No extractable data defined for " + etcitem); + LOGGER.info("No extractable data defined for " + etcitem); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 5c5598ea69..ac21e53795 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -84,7 +84,7 @@ public class FishShots implements IItemHandler if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 4773bde656..59fe8bc737 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -51,7 +51,7 @@ public final class Harvester implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 9a2b86002c..8cf5343497 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -61,7 +61,7 @@ public class ItemSkillsTemplate implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.info("Item " + item + " does not have registered any skill for handler."); + LOGGER.info("Item " + item + " does not have registered any skill for handler."); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 05c1ac3f7d..d3ffb95e30 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -49,7 +49,7 @@ public class SoulShots implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index ddf0402d2b..87f06565c2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -48,7 +48,7 @@ public class SpiritShot implements IItemHandler final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); if (skills == null) { - _log.warning(getClass().getSimpleName() + ": is missing skills!"); + LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java index 7144892fa5..59ecba44bb 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ClanWarsList implements IUserCommandHandler { - private static final Logger _log = Logger.getLogger(ClanWarsList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanWarsList.class.getName()); private static final int[] COMMAND_IDS = { 88, @@ -119,7 +119,7 @@ public class ClanWarsList implements IUserCommandHandler } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/instances/AbstractInstance.java index 7dced5f20e..5e98fa04f5 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - _log.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); return; } @@ -133,7 +133,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // When nobody can enter if (enterGroup == null) { - _log.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); + LOGGER.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!"); return; } @@ -214,7 +214,7 @@ public abstract class AbstractInstance extends AbstractNpcAI } else { - _log.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); + LOGGER.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")"); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/QuestMasterHandler.java index a0e3d089fa..406d9ab4a2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/QuestMasterHandler.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/QuestMasterHandler.java @@ -169,7 +169,7 @@ import quests.Q11019_TribalBenefit.Q11019_TribalBenefit; */ public class QuestMasterHandler { - private static final Logger _log = Logger.getLogger(QuestMasterHandler.class.getName()); + private static final Logger LOGGER = Logger.getLogger(QuestMasterHandler.class.getName()); private static final Class[] QUESTS = { @@ -329,7 +329,7 @@ public class QuestMasterHandler } catch (Exception e) { - _log.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); + LOGGER.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseRecievePacket.java index b8e2b08f14..33146d6d53 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseRecievePacket.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public abstract class BaseRecievePacket { - private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseRecievePacket.class.getName()); private final byte[] _decrypt; private int _off; @@ -78,7 +78,7 @@ public abstract class BaseRecievePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } return result; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseSendablePacket.java index 894ea357b0..c29adc3bce 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseSendablePacket.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; */ public abstract class BaseSendablePacket { - private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName()); + private static final Logger LOGGER = Logger.getLogger(BaseSendablePacket.class.getName()); private final ByteArrayOutputStream _bao; @@ -78,7 +78,7 @@ public abstract class BaseSendablePacket } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } _bao.write(0); @@ -93,7 +93,7 @@ public abstract class BaseSendablePacket } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java index a2f78c7c94..a11ea8c3b5 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; public class ScrambledKeyPair { - private static Logger _log = Logger.getLogger(ScrambledKeyPair.class.getName()); + private static Logger LOGGER = Logger.getLogger(ScrambledKeyPair.class.getName()); public KeyPair _pair; public byte[] _scrambledModulus; @@ -66,7 +66,7 @@ public class ScrambledKeyPair { scrambledMod[0x40 + i] = (byte) (scrambledMod[0x40 + i] ^ scrambledMod[i]); } - _log.finer("Modulus was scrambled"); + LOGGER.finer("Modulus was scrambled"); return scrambledMod; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java index a4df772cc3..57a47cf456 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class ForumsBBSManager extends BaseBBSManager { - private static Logger _log = Logger.getLogger(ForumsBBSManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(ForumsBBSManager.class.getName()); private final List _table; private int _lastid = 1; @@ -51,7 +51,7 @@ public class ForumsBBSManager extends BaseBBSManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e); } } @@ -61,7 +61,7 @@ public class ForumsBBSManager extends BaseBBSManager public void initRoot() { _table.forEach(f -> f.vload()); - _log.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid); } /** diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java index 609f0858d5..4aa8b72edb 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class CharNameTable { - private static Logger _log = Logger.getLogger(CharNameTable.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharNameTable.class.getName()); private final Map _chars = new ConcurrentHashMap<>(); private final Map _accessLevels = new ConcurrentHashMap<>(); @@ -114,7 +114,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e); } if (id > 0) @@ -162,7 +162,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return null; // not found @@ -190,7 +190,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e); } return result; } @@ -211,7 +211,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e); } return 0; } @@ -232,7 +232,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -253,7 +253,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e); } return 0; } @@ -274,7 +274,7 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e); } return 0; } @@ -294,9 +294,9 @@ public class CharNameTable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names."); } public static CharNameTable getInstance() diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/engines/DocumentBase.java index 37410b0b38..fde34c2bc6 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/engines/DocumentBase.java @@ -148,7 +148,7 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public abstract class DocumentBase { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final File _file; protected final Map _tables = new HashMap<>(); @@ -171,7 +171,7 @@ public abstract class DocumentBase } catch (Exception e) { - _log.log(Level.SEVERE, "Error loading file " + _file, e); + LOGGER.log(Level.SEVERE, "Error loading file " + _file, e); } return doc; } @@ -344,7 +344,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -361,7 +361,7 @@ public abstract class DocumentBase } if ((cond.conditions == null) || (cond.conditions.length == 0)) { - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); } return cond; } @@ -375,7 +375,7 @@ public abstract class DocumentBase return new ConditionLogicNot(parseCondition(n, template)); } } - _log.severe("Empty condition in " + _file); + LOGGER.severe("Empty condition in " + _file); return null; } @@ -900,7 +900,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1095,7 +1095,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1135,7 +1135,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); + LOGGER.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item); } } cond = joinAnd(cond, new ConditionUsingItemType(mask)); @@ -1156,7 +1156,7 @@ public abstract class DocumentBase if (old == mask) { - _log.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); + LOGGER.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item); } } cond = joinAnd(cond, new ConditionUsingSlotType(mask)); @@ -1192,7 +1192,7 @@ public abstract class DocumentBase if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } @@ -1222,7 +1222,7 @@ public abstract class DocumentBase } if (cond == null) { - _log.severe("Unrecognized condition in " + _file); + LOGGER.severe("Unrecognized condition in " + _file); } return cond; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java index 4d3be938c9..c425e3360c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.LinkedList; import java.util.List; import java.util.logging.Level; +import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -43,6 +44,8 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; */ public final class DocumentItem extends DocumentBase implements IGameXmlReader { + Logger LOGGER = Logger.getLogger(DocumentItem.class.getName()); + private Item _currentItem = null; private final List _itemsInFile = new LinkedList<>(); @@ -92,7 +95,7 @@ public final class DocumentItem extends DocumentBase implements IGameXmlReader } catch (Exception e) { - _log.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); + LOGGER.log(Level.WARNING, "Cannot create item " + _currentItem.id, e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 6832094027..5343f17e51 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.util.MathUtil; */ public class GeoEngine { - protected static final Logger _log = Logger.getLogger(GeoEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GeoEngine.class.getName()); private final ABlock[][] _blocks; private final BlockNull _nullBlock; @@ -71,7 +71,7 @@ public class GeoEngine */ public GeoEngine() { - _log.info("GeoEngine: Initializing..."); + LOGGER.info("GeoEngine: Initializing..."); // initialize block container _blocks = new ABlock[GeoStructure.GEO_BLOCKS_X][GeoStructure.GEO_BLOCKS_Y]; @@ -105,7 +105,7 @@ public class GeoEngine } } - _log.info("GeoEngine: Loaded " + loaded + " geodata files."); + LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files."); // avoid wrong configs when no files are loaded if (loaded == 0) @@ -113,12 +113,12 @@ public class GeoEngine if (Config.PATHFINDING) { Config.PATHFINDING = false; - _log.info("GeoEngine: Forcing PathFinding setting to false."); + LOGGER.info("GeoEngine: Forcing PathFinding setting to false."); } if (Config.COORD_SYNCHRONIZE == 2) { Config.COORD_SYNCHRONIZE = -1; - _log.info("GeoEngine: Forcing CoordSynchronize setting to -1."); + LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); } } @@ -185,7 +185,7 @@ public class GeoEngine // check data consistency if (buffer.remaining() > 0) { - _log.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); + LOGGER.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read."); } // loading was successful @@ -194,8 +194,8 @@ public class GeoEngine catch (Exception e) { // an error occured while loading, load null blocks - _log.warning("GeoEngine: Error while loading " + filename + " region file."); - _log.warning(e.getMessage()); + LOGGER.warning("GeoEngine: Error while loading " + filename + " region file."); + LOGGER.warning(e.getMessage()); e.printStackTrace(); // replace whole region file with null blocks @@ -300,7 +300,7 @@ public class GeoEngine if (block == null) // null block check { // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) - // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // LOGGER.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java index ece8351c5e..b33b0292ac 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java @@ -57,11 +57,11 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); + LOGGER.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf); } } - _log.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); + LOGGER.info("GeoEnginePathfinding: Loaded " + count + " node buffers."); } @Override @@ -109,7 +109,7 @@ final class GeoEnginePathfinding extends GeoEngine } catch (Exception e) { - _log.warning(e.getMessage()); + LOGGER.warning(e.getMessage()); return null; } finally diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IActionHandler.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IActionHandler.java index c4addd7df5..3640b57f65 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IActionHandler.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IActionHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionHandler { - Logger _log = Logger.getLogger(IActionHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java index 35c546715c..5c5b946828 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IActionShiftHandler.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IActionShiftHandler { - Logger _log = Logger.getLogger(IActionShiftHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IActionShiftHandler.class.getName()); boolean action(L2PcInstance activeChar, L2Object target, boolean interact); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IBypassHandler.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IBypassHandler.java index a5a6295386..626cdb2b17 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IBypassHandler.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IBypassHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public interface IBypassHandler { - Logger _log = Logger.getLogger(IBypassHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IBypassHandler.class.getName()); /** * This is the worker method that is called when someone uses an bypass command. diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IItemHandler.java index 2f3d043ad0..a2079cc4ec 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IItemHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public interface IItemHandler { - Logger _log = Logger.getLogger(IItemHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IItemHandler.class.getName()); /** * Launch task associated to the item. diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java index 4030ad83de..0f9c7b0132 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentType; */ public interface IPunishmentHandler { - Logger _log = Logger.getLogger(IPunishmentHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IPunishmentHandler.class.getName()); void onStart(PunishmentTask task); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java index 72b8a7b21a..d1cb086c89 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IUserCommandHandler { - Logger _log = Logger.getLogger(IUserCommandHandler.class.getName()); + Logger LOGGER = Logger.getLogger(IUserCommandHandler.class.getName()); /** * this is the worker method that is called when someone uses an admin command. diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java index e16e1eb679..9712fd7b04 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -60,7 +60,7 @@ import com.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi */ public final class CommissionManager { - private static final Logger _log = Logger.getLogger(CommissionManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CommissionManager.class.getName()); private static final int INTERACTION_DISTANCE = 250; private static final int ITEMS_LIMIT_PER_REQUEST = 999; @@ -103,7 +103,7 @@ public final class CommissionManager final L2ItemInstance itemInstance = itemInstances.get(rs.getInt("item_object_id")); if (itemInstance == null) { - _log.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); + LOGGER.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load."); continue; } final CommissionItem commissionItem = new CommissionItem(commissionId, itemInstance, rs.getLong("price_per_unit"), rs.getTimestamp("start_time").toInstant(), rs.getByte("duration_in_days")); @@ -121,7 +121,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e); } } @@ -270,7 +270,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e); player.sendPacket(SystemMessageId.THE_ITEM_HAS_FAILED_TO_BE_REGISTERED); player.sendPacket(ExResponseCommissionRegister.FAILED); } @@ -409,7 +409,7 @@ public final class CommissionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java index 7f4c6abd61..f635c19883 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class FactionManager { - private static Logger _log = Logger.getLogger(FactionManager.class.getName()); + private static Logger LOGGER = Logger.getLogger(FactionManager.class.getName()); private final Map _playerFactions = new ConcurrentHashMap<>(); protected FactionManager() @@ -57,9 +57,9 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e); } - _log.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values."); } public final int getFactionByCharId(int id) @@ -91,7 +91,7 @@ public class FactionManager } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e); } return 0; // not found diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index b0fdfdf390..dc63278e16 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.entity.Fort; public final class FortManager implements InstanceListManager { - protected static final Logger _log = Logger.getLogger(FortManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName()); private final Map _forts = new ConcurrentSkipListMap<>(); @@ -131,7 +131,7 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - _log.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); for (Fort fort : getForts()) { fort.getSiege().loadSiegeGuard(); @@ -139,7 +139,7 @@ public final class FortManager implements InstanceListManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index aa7e2d3153..0a5245dafc 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class FortSiegeManager { - private static final Logger _log = Logger.getLogger(FortSiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FortSiegeManager.class.getName()); private int _attackerMaxClans = 500; // Max number of clans @@ -101,7 +101,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -122,7 +122,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); + LOGGER.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e); } // Siege setting @@ -163,7 +163,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading commander(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading commander(s) for " + fort.getName() + " fort."); } } @@ -189,7 +189,7 @@ public final class FortSiegeManager } catch (Exception e) { - _log.warning("Error while loading flag(s) for " + fort.getName() + " fort."); + LOGGER.warning("Error while loading flag(s) for " + fort.getName() + " fort."); } } _flagList.put(fort.getResidenceId(), _flagSpawns); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index 14f412ec48..338620a64f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; public final class GraciaSeedsManager { - private static final Logger _log = Logger.getLogger(GraciaSeedsManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GraciaSeedsManager.class.getName()); public static String ENERGY_SEEDS = "EnergySeeds"; @@ -70,7 +70,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); + LOGGER.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType); break; } } @@ -124,7 +124,7 @@ public final class GraciaSeedsManager } default: { - _log.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); + LOGGER.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! "); } } } @@ -134,7 +134,7 @@ public final class GraciaSeedsManager final Quest quest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (quest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -155,7 +155,7 @@ public final class GraciaSeedsManager final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); if (esQuest == null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } else { @@ -171,7 +171,7 @@ public final class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { - _log.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); + LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 99c7fa7996..7102530261 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -47,7 +47,7 @@ public final class GrandBossManager implements IStorable private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?"; private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?"; - protected static Logger _log = Logger.getLogger(GrandBossManager.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GrandBossManager.class.getName()); protected static Map _bosses = new ConcurrentHashMap<>(); @@ -83,26 +83,26 @@ public final class GrandBossManager implements IStorable final int status = rs.getInt("status"); _bossStatus.put(bossId, status); _storedInfo.put(bossId, info); - _log.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); + LOGGER.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status); if (status > 0) { - _log.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); + LOGGER.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time"))); } } else { - _log.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); + LOGGER.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId); } } - _log.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances."); } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e); } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e); } ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000); } @@ -119,7 +119,7 @@ public final class GrandBossManager implements IStorable public void setBossStatus(int bossId, int status) { _bossStatus.put(bossId, status); - _log.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); + LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status); updateDb(bossId, true); } @@ -198,7 +198,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e); return false; } return true; @@ -246,7 +246,7 @@ public final class GrandBossManager implements IStorable } catch (SQLException e) { - _log.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index e8b430a5df..c7290b6912 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public final class ItemsOnGroundManager implements Runnable { - private static final Logger _log = Logger.getLogger(ItemsOnGroundManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemsOnGroundManager.class.getName()); private final Set _items = ConcurrentHashMap.newKeySet(); @@ -88,7 +88,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e); } } @@ -137,11 +137,11 @@ public final class ItemsOnGroundManager implements Runnable } } } - _log.info(getClass().getSimpleName() + ": Loaded " + count + " items."); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + count + " items."); } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e); } if (Config.EMPTY_DROPPED_ITEM_TABLE_AFTER_LOAD) @@ -185,7 +185,7 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e1) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1); } } @@ -235,13 +235,13 @@ public final class ItemsOnGroundManager implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e); } } } catch (SQLException e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java index ba4fdd6b6c..f47cf3f813 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.variables.PlayerVariables; */ public class MentorManager { - private static final Logger _log = Logger.getLogger(MentorManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MentorManager.class.getName()); private final Map> _menteeData = new ConcurrentHashMap<>(); private final Map _mentors = new ConcurrentHashMap<>(); @@ -65,7 +65,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -85,7 +85,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -104,7 +104,7 @@ public class MentorManager } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } finally { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index f0f9d590c3..07ca9d909e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class PetitionManager { - protected static final Logger _log = Logger.getLogger(PetitionManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PetitionManager.class.getName()); private final Map _pendingPetitions; private final Map _completedPetitions; @@ -55,7 +55,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getCompletedPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() @@ -63,7 +63,7 @@ public final class PetitionManager final int numPetitions = getPendingPetitionCount(); getPendingPetitions().clear(); - _log.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); + LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } public boolean acceptPetition(L2PcInstance respondingAdmin, int petitionId) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java index c1df0ca78b..6208afb86b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.Shutdown; */ public class ServerRestartManager { - static final Logger _log = Logger.getLogger(ServerRestartManager.class.getName()); + static final Logger LOGGER = Logger.getLogger(ServerRestartManager.class.getName()); private String nextRestartTime = "unknown"; @@ -72,12 +72,12 @@ public class ServerRestartManager { nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime()); ThreadPool.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000)); - _log.info("Scheduled server restart at " + lastRestart.getTime() + "."); + LOGGER.info("Scheduled server restart at " + lastRestart.getTime() + "."); } } catch (Exception e) { - _log.info("The scheduled server restart config is not set properly, please correct it!"); + LOGGER.info("The scheduled server restart config is not set properly, please correct it!"); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java index 0cef166f06..e7fa0b41a8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; public final class SiegeManager { - private static final Logger _log = Logger.getLogger(SiegeManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SiegeManager.class.getName()); private final Map> _controlTowers = new HashMap<>(); private final Map> _flameTowers = new HashMap<>(); @@ -103,7 +103,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e); } return register; } @@ -152,7 +152,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle."); } } @@ -183,7 +183,7 @@ public final class SiegeManager } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); + LOGGER.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle."); } } _controlTowers.put(castle.getResidenceId(), controlTowers); @@ -289,7 +289,7 @@ public final class SiegeManager } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java index 5e16e5a91f..876a3a1ec9 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/tasks/MessageDeletionTask.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class MessageDeletionTask implements Runnable { - private static final Logger _log = Logger.getLogger(MessageDeletionTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MessageDeletionTask.class.getName()); final int _msgId; @@ -76,7 +76,7 @@ public final class MessageDeletionTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e); } } MailManager.getInstance().deleteMessageInDb(msg.getId()); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/BlockList.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/BlockList.java index 627b0dbbe4..3ec7e52fe7 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/BlockList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/BlockList.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BlockList { - private static Logger _log = Logger.getLogger(BlockList.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlockList.class.getName()); private static final Map> OFFLINE_LIST = new ConcurrentHashMap<>(); private final L2PcInstance _owner; @@ -91,7 +91,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + ObjId + " FriendList while loading BlockList: " + e.getMessage(), e); } return list; } @@ -122,7 +122,7 @@ public class BlockList } catch (Exception e) { - _log.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add block player: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java index 7be7f3cb10..f44f27266b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate; */ public final class CharEffectList { - private static final Logger _log = Logger.getLogger(CharEffectList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); /** Queue containing all effects from buffs for this effect list. */ private volatile Queue _actives; /** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */ @@ -897,7 +897,7 @@ public final class CharEffectList // Passive effects don't need stack type! if (!skill.getAbnormalType().isNone()) { - _log.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); + LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); } // Check for passive skill conditions. diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/CursedWeapon.java index d579628d09..a9be2c6a4a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class CursedWeapon implements INamable { - private static final Logger _log = Logger.getLogger(CursedWeapon.class.getName()); + private static final Logger LOGGER = Logger.getLogger(CursedWeapon.class.getName()); // _name is the name of the cursed weapon associated with its ID. private final String _name; @@ -95,7 +95,7 @@ public class CursedWeapon implements INamable if ((_player != null) && _player.isOnline()) { // Remove from player - _log.info(_name + " being removed online."); + LOGGER.info(_name + " being removed online."); _player.abortAttack(); @@ -134,7 +134,7 @@ public class CursedWeapon implements INamable else { // Remove from Db - _log.info(_name + " being removed offline."); + LOGGER.info(_name + " being removed offline."); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?"); @@ -145,7 +145,7 @@ public class CursedWeapon implements INamable del.setInt(2, _itemId); if (del.executeUpdate() != 1) { - _log.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); + LOGGER.warning("Error while deleting itemId " + _itemId + " from userId " + _playerId); } // Restore the reputation @@ -154,12 +154,12 @@ public class CursedWeapon implements INamable ps.setInt(3, _playerId); if (ps.executeUpdate() != 1) { - _log.warning("Error while updating karma & pkkills for userId " + _playerId); + LOGGER.warning("Error while updating karma & pkkills for userId " + _playerId); } } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete : " + e.getMessage(), e); } } } @@ -196,7 +196,7 @@ public class CursedWeapon implements INamable else if (_item != null) { _item.decayMe(); - _log.info(_name + " item has been removed from World."); + LOGGER.info(_name + " item has been removed from World."); } } @@ -492,7 +492,7 @@ public class CursedWeapon implements INamable } catch (SQLException e) { - _log.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); + LOGGER.log(Level.SEVERE, "CursedWeapon: Failed to save data.", e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java index 13aef855d1..cb62c8c590 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -81,7 +81,7 @@ import com.l2jmobius.gameserver.util.Util; public class L2Clan implements IIdentifiable, INamable { - private static final Logger _log = Logger.getLogger(L2Clan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Clan.class.getName()); // SQL queries private static final String INSERT_CLAN_DATA = "INSERT INTO clan_data (clan_id,clan_name,clan_level,hasCastle,blood_alliance_count,blood_oath_count,ally_id,ally_name,leader_id,crest_id,crest_large_id,ally_crest_id,new_leader_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -273,7 +273,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for old clan leader", e); } } @@ -313,14 +313,14 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); + LOGGER.log(Level.WARNING, "Couldn't update clan privs for new clan leader", e); } } broadcastClanStatus(); broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1).addString(member.getName())); - _log.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); + LOGGER.info("Leader of Clan: " + getName() + " changed to: " + member.getName() + " ex leader: " + exMember.getName()); } /** @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - _log.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + getName() + " without clan leader!"); return ""; } return _leader.getName(); @@ -433,7 +433,7 @@ public class L2Clan implements IIdentifiable, INamable final L2ClanMember exMember = _members.remove(objectId); if (exMember == null) { - _log.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); + LOGGER.warning("Member Object ID: " + objectId + " not found in clan while trying to remove"); return; } final int leadssubpledge = getLeaderSubPledge(objectId); @@ -888,7 +888,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -932,7 +932,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateBloodAllianceCountInDB(): " + e.getMessage(), e); } } @@ -948,7 +948,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on updateClanScoreInDb(): " + e.getMessage(), e); } // Update variables at database @@ -991,7 +991,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving clan: " + e.getMessage(), e); } } @@ -1032,7 +1032,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving new clan: " + e.getMessage(), e); } } @@ -1062,7 +1062,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error removing clan member: " + e.getMessage(), e); } } @@ -1137,7 +1137,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan data: " + e.getMessage(), e); } } @@ -1158,7 +1158,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan notice: " + e.getMessage(), e); } } @@ -1200,7 +1200,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e); } _notice = notice; @@ -1267,7 +1267,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); + LOGGER.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped."); } } } @@ -1275,7 +1275,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan skills: " + e.getMessage(), e); } } @@ -1351,7 +1351,7 @@ public class L2Clan implements IIdentifiable, INamable } else { - _log.warning("Subpledge " + subType + " does not exist for clan " + this); + LOGGER.warning("Subpledge " + subType + " does not exist for clan " + this); return oldSkill; } } @@ -1383,7 +1383,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store clan skills: " + e.getMessage(), e); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_SKILL_S1_HAS_BEEN_ADDED); @@ -1435,7 +1435,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } @@ -1781,7 +1781,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore clan sub-units: " + e.getMessage(), e); } } @@ -1890,7 +1890,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e); } broadcastToOnlineMembers(new PledgeShowInfoUpdate(_leader.getClan())); @@ -1955,7 +1955,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error updating subpledge: " + e.getMessage(), e); } } @@ -1987,7 +1987,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error restoring clan privs by rank: " + e.getMessage(), e); } } @@ -2023,7 +2023,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } for (L2ClanMember cm : getMembers()) @@ -2058,7 +2058,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not create new rank and store clan privs for rank: " + e.getMessage(), e); } } } @@ -2174,7 +2174,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store auction for clan: " + e.getMessage(), e); } } } @@ -2717,7 +2717,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (Exception e) { - _log.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "could not increase clan level:" + e.getMessage(), e); } setLevel(level); @@ -2763,7 +2763,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2800,7 +2800,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update ally crest for ally/clan id " + allyId + " : " + e.getMessage(), e); } if (onlyThisClan) @@ -2846,7 +2846,7 @@ public class L2Clan implements IIdentifiable, INamable } catch (SQLException e) { - _log.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Mentee.java index 6122c5f6ac..a1eb3d2480 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class L2Mentee { - private static final Logger _log = Logger.getLogger(L2Mentee.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Mentee.class.getName()); private final int _objectId; private String _name; @@ -65,7 +65,7 @@ public class L2Mentee } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } else diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java index 5f14864046..38044ee767 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2Party extends AbstractPlayerGroup { - private static final Logger _log = Logger.getLogger(L2Party.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2Party.class.getName()); // @formatter:off private static final double[] BONUS_EXP_SP = @@ -536,7 +536,7 @@ public class L2Party extends AbstractPlayerGroup } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } SystemMessage msg; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Territory.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Territory.java index 41cb26df2b..2ee5d868d2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Territory.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Territory.java @@ -28,7 +28,7 @@ import com.l2jmobius.commons.util.Rnd; */ public class L2Territory { - private static Logger _log = Logger.getLogger(L2Territory.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2Territory.class.getName()); protected static class Point { @@ -176,7 +176,7 @@ public class L2Territory return new Location(x, y, Rnd.get(zmin, _zMax)); } } - _log.warning("Can't make point for territory " + _terr); + LOGGER.warning("Can't make point for territory " + _terr); return null; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/MacroList.java index 737e876e1e..577b101249 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/MacroList.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SendMacroList; public class MacroList implements IRestorable { - private static final Logger _log = Logger.getLogger(MacroList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(MacroList.class.getName()); private final L2PcInstance _owner; private int _macroId; @@ -154,7 +154,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store macro:", e); + LOGGER.log(Level.WARNING, "could not store macro:", e); } } @@ -169,7 +169,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete macro:", e); + LOGGER.log(Level.WARNING, "could not delete macro:", e); } } @@ -215,7 +215,7 @@ public class MacroList implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "could not store shortcuts:", e); + LOGGER.log(Level.WARNING, "could not store shortcuts:", e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/ShortCuts.java index 3f8d959ef6..81e2c6f902 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/ShortCuts.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; public class ShortCuts implements IRestorable { - private static Logger _log = Logger.getLogger(ShortCuts.class.getName()); + private static Logger LOGGER = Logger.getLogger(ShortCuts.class.getName()); private static final int MAX_SHORTCUTS_PER_BAR = 12; private final L2PcInstance _owner; private final Map _shortCuts = new TreeMap<>(); @@ -100,7 +100,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store character shortcut: " + e.getMessage(), e); } } @@ -165,7 +165,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character shortcut: " + e.getMessage(), e); } } @@ -195,7 +195,7 @@ public class ShortCuts implements IRestorable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character shortcuts: " + e.getMessage(), e); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/TradeList.java index 7a25f5afe4..e3a47338d3 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/TradeList.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class TradeList { - private static final Logger _log = Logger.getLogger(TradeList.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TradeList.class.getName()); private final L2PcInstance _owner; private L2PcInstance _partner; @@ -204,45 +204,45 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Object o = L2World.getInstance().findObject(objectId); if (!(o instanceof L2ItemInstance)) { - _log.warning(_owner.getName() + ": Trying to add something other than an item!"); + LOGGER.warning(_owner.getName() + ": Trying to add something other than an item!"); return null; } final L2ItemInstance item = (L2ItemInstance) o; if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { - _log.warning(_owner.getName() + ": Attempt to add a restricted item!"); + LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) { - _log.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; } if ((count <= 0) || (count > item.getCount())) { - _log.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item with invalid item count!"); return null; } if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -250,7 +250,7 @@ public class TradeList { if (checkitem.getObjectId() == objectId) { - _log.warning(_owner.getName() + ": Attempt to add an item that is already present!"); + LOGGER.warning(_owner.getName() + ": Attempt to add an item that is already present!"); return null; } } @@ -274,14 +274,14 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to add invalid item to TradeList!"); return null; } @@ -292,13 +292,13 @@ public class TradeList if (!item.isStackable() && (count > 1)) { - _log.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); + LOGGER.warning(_owner.getName() + ": Attempt to add non-stackable item to TradeList with count > 1!"); return null; } if ((Inventory.MAX_ADENA / count) < price) { - _log.warning(_owner.getName() + ": Attempt to overflow adena !"); + LOGGER.warning(_owner.getName() + ": Attempt to overflow adena !"); return null; } @@ -321,13 +321,13 @@ public class TradeList { if (isLocked()) { - _log.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; } if (count < 0) { - _log.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); + LOGGER.warning(_owner.getName() + ": Attempt to remove " + count + " items from TradeList!"); return null; } @@ -341,7 +341,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return null; } partnerList.invalidateConfirmation(); @@ -416,7 +416,7 @@ public class TradeList final TradeList partnerList = _partner.getActiveTradeList(); if (partnerList == null) { - _log.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); + LOGGER.warning(_partner.getName() + ": Trading partner (" + _partner.getName() + ") is invalid in this trade!"); return false; } @@ -485,7 +485,7 @@ public class TradeList // Check for Owner validity if ((_owner == null) || (L2World.getInstance().getPlayer(_owner.getObjectId()) == null)) { - _log.warning("Invalid owner of TradeList"); + LOGGER.warning("Invalid owner of TradeList"); return false; } @@ -495,7 +495,7 @@ public class TradeList final L2ItemInstance item = _owner.checkItemManipulation(titem.getObjectId(), titem.getCount(), "transfer"); if ((item == null) || (item.getCount() < 1)) { - _log.warning(_owner.getName() + ": Invalid Item in TradeList"); + LOGGER.warning(_owner.getName() + ": Invalid Item in TradeList"); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 6e200ddb09..96527cad1e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -632,7 +632,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } @@ -690,7 +690,7 @@ public class L2Attackable extends L2Npc } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -803,7 +803,7 @@ public class L2Attackable extends L2Npc final AggroInfo ai = getAggroList().get(target); if (ai == null) { - _log.info("target " + target + " not present in aggro list of " + this); + LOGGER.info("target " + target + " not present in aggro list of " + this); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 944e723989..1ebbe0e5f3 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -176,7 +176,7 @@ import com.l2jmobius.gameserver.util.Util; */ public abstract class L2Character extends L2Object implements ISkillsHolder, IDeletable { - public static final Logger _log = Logger.getLogger(L2Character.class.getName()); + public static final Logger LOGGER = Logger.getLogger(L2Character.class.getName()); private volatile Set> _attackByList; @@ -3278,7 +3278,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Temporary fix for character outside world region errors (should not happen) if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) { - _log.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); + LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); if (isPlayer()) { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 1caa0adf75..1ce08f4112 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -624,7 +624,7 @@ public class L2Npc extends L2Character } else { - _log.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown NPC bypass: \"" + command + "\" NpcId: " + getId()); } } } @@ -1189,7 +1189,7 @@ public class L2Npc extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } if (isChannelized()) @@ -1560,7 +1560,7 @@ public class L2Npc extends L2Character if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); + LOGGER.severe("Item doesn't exist so cannot be dropped. Item ID: " + itemId + " Quest: " + getName()); return null; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java index 94fe6bb6b5..3dd9a9d68e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Vehicle.java @@ -395,7 +395,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed stopMove().", e); + LOGGER.log(Level.SEVERE, "Failed stopMove().", e); } try @@ -404,7 +404,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed oustPlayers().", e); + LOGGER.log(Level.SEVERE, "Failed oustPlayers().", e); } final ZoneRegion oldZoneRegion = ZoneManager.getInstance().getRegion(this); @@ -415,7 +415,7 @@ public abstract class L2Vehicle extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Failed decayMe().", e); + LOGGER.log(Level.SEVERE, "Failed decayMe().", e); } oldZoneRegion.removeFromZones(this); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java index 8e72579b54..05339545d3 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ControlTowerInstance.java @@ -61,7 +61,7 @@ public class L2ControlTowerInstance extends L2Tower } catch (Exception e) { - _log.log(Level.WARNING, "Error at L2ControlTowerInstance", e); + LOGGER.log(Level.WARNING, "Error at L2ControlTowerInstance", e); } } _guards.clear(); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 6c554e10e0..91548e2a10 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -100,7 +100,7 @@ public class L2DecoyInstance extends L2Character } catch (Exception e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } @@ -126,7 +126,7 @@ public class L2DecoyInstance extends L2Character } catch (Throwable e) { - _log.log(Level.SEVERE, "Decoy Error: ", e); + LOGGER.log(Level.SEVERE, "Decoy Error: ", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index f9aa07f44d..97c2348dec 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -123,7 +123,7 @@ public class L2DefenderInstance extends L2Attackable if ((_fort == null) && (_castle == null)) { - _log.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); + LOGGER.warning("L2DefenderInstance spawned outside of Fortress or Castle zone!" + this); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 4fb7bbb976..baab09b858 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -219,7 +219,7 @@ public final class L2DoorInstance extends L2Character } else { - _log.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); + LOGGER.warning(getClass().getSimpleName() + ": cannot find child id: " + getChildId()); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 71096be532..1519fc6308 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -74,14 +74,14 @@ public class L2MerchantInstance extends L2NpcInstance final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) { - _log.warning("BuyList not found! BuyListId:" + val); + LOGGER.warning("BuyList not found! BuyListId:" + val); player.sendPacket(ActionFailed.STATIC_PACKET); return; } if (!buyList.isNpcAllowed(getId())) { - _log.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); + LOGGER.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId()); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 0b621c12b6..175dccc56f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -1309,7 +1309,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Attempted to remove unknown RecipeList: " + recipeId); + LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } for (Shortcut sc : getAllShortCuts()) @@ -1334,7 +1334,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while inserting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -1350,7 +1350,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); + LOGGER.log(Level.WARNING, "SQL exception while deleting recipe: " + recipeId + " from character " + getObjectId(), e); } } @@ -2602,7 +2602,7 @@ public final class L2PcInstance extends L2Playable } else { - _log.warning("Skipping null auto-get skill for player: " + toString()); + LOGGER.warning("Skipping null auto-get skill for player: " + toString()); } } } @@ -3248,7 +3248,7 @@ public final class L2PcInstance extends L2Playable final L2Item item = ItemTable.getInstance().getTemplate(itemId); if (item == null) { - _log.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); + LOGGER.severe("Item doesn't exist so cannot be added. Item ID: " + itemId); return null; } // Sends message to client if requested @@ -3291,7 +3291,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof L2EtcItem ? (L2EtcItem) item : null); if (handler == null) { - _log.warning("No item handler registered for Herb ID " + item.getId() + "!"); + LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!"); } else { @@ -3809,7 +3809,7 @@ public final class L2PcInstance extends L2Playable // TODO: if we remove objects that are not visisble from the L2World, we'll have to remove this check if (L2World.getInstance().findObject(objectId) == null) { - _log.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item not available in L2World"); return null; } @@ -3817,19 +3817,19 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return null; } if ((count < 0) || ((count > 1) && !item.isStackable())) { - _log.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item with invalid count: " + count); return null; } if (count > item.getCount()) { - _log.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " more items than he owns"); return null; } @@ -3858,7 +3858,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_protectEndTime > 0))) { - _log.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _protectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -3868,7 +3868,7 @@ public final class L2PcInstance extends L2Playable { if (Config.DEVELOPER && (protect || (_teleportProtectEndTime > 0))) { - _log.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); + LOGGER.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getInstance().getGameTicks() + ")"); } _teleportProtectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; @@ -4383,7 +4383,7 @@ public final class L2PcInstance extends L2Playable if (!object.isItem()) { // dont try to pickup anything that is not an item :) - _log.warning(this + " trying to pickup wrong target." + getTarget()); + LOGGER.warning(this + " trying to pickup wrong target." + getTarget()); return; } @@ -4483,7 +4483,7 @@ public final class L2PcInstance extends L2Playable final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -5142,11 +5142,11 @@ public final class L2PcInstance extends L2Playable if (isKarmaDrop) { - _log.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } else { - _log.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); + LOGGER.warning(getName() + " dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); } if (++dropCount >= dropLimit) @@ -6240,7 +6240,7 @@ public final class L2PcInstance extends L2Playable L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level); if (accessLevel == null) { - _log.warning("Can't find access level " + level + " for character " + toString()); + LOGGER.warning("Can't find access level " + level + " for character " + toString()); accessLevel = AdminData.getInstance().getAccessLevel(0); } @@ -6249,7 +6249,7 @@ public final class L2PcInstance extends L2Playable accessLevel = AdminData.getInstance().getAccessLevel(Config.DEFAULT_ACCESS_LEVEL); if (accessLevel == null) { - _log.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); + LOGGER.warning("Config's default access level (" + Config.DEFAULT_ACCESS_LEVEL + ") is not defined, defaulting to 0!"); accessLevel = AdminData.getInstance().getAccessLevel(0); Config.DEFAULT_ACCESS_LEVEL = 0; } @@ -6275,7 +6275,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); + LOGGER.log(Level.WARNING, "Failed to update character's accesslevel in db: " + toString(), e); } } @@ -6283,11 +6283,11 @@ public final class L2PcInstance extends L2Playable if (accessLevel == null) { - _log.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); + LOGGER.warning("Tryed to set unregistered access level " + level + " for " + toString() + ". Setting access level without privileges!"); } else if (level > 0) { - _log.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); + LOGGER.warning(_accessLevel.getName() + " access level set for character " + getName() + "! Just a warning to be careful ;)"); } } @@ -6396,7 +6396,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed updating character online status.", e); + LOGGER.log(Level.SEVERE, "Failed updating character online status.", e); } } @@ -6449,7 +6449,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not insert char data: " + e.getMessage(), e); return false; } return true; @@ -6597,7 +6597,7 @@ public final class L2PcInstance extends L2Playable catch (Exception e) { player.setBaseClass(activeClassId); - _log.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); + LOGGER.log(Level.WARNING, "Exception during player.setBaseClass for player: " + player + " base class: " + rset.getInt("base_class"), e); } // Restore Subclass Data (cannot be done earlier in function) @@ -6620,7 +6620,7 @@ public final class L2PcInstance extends L2Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - _log.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -6761,7 +6761,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed loading character.", e); + LOGGER.log(Level.SEVERE, "Failed loading character.", e); } return player; } @@ -6851,7 +6851,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e); } return true; } @@ -6959,7 +6959,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e); } } @@ -6989,7 +6989,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not restore premium items: " + e.getMessage(), e); } } @@ -7005,7 +7005,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not update premium items: " + e.getMessage(), e); } } @@ -7020,7 +7020,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.severe("Could not delete premium item: " + e); + LOGGER.severe("Could not delete premium item: " + e); } } @@ -7138,7 +7138,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store char base data: " + this + " - " + e.getMessage(), e); } } @@ -7168,7 +7168,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not store sub class data for " + getName() + ": " + e.getMessage(), e); } } @@ -7292,7 +7292,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store char effect data: ", e); } } @@ -7324,7 +7324,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store char item reuse data: ", e); + LOGGER.log(Level.WARNING, "Could not store char item reuse data: ", e); } } @@ -7413,7 +7413,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not delete skill: " + e.getMessage(), e); } } @@ -7473,12 +7473,12 @@ public final class L2PcInstance extends L2Playable } // else // { - // _log.warning("Could not store new skill, it's null!"); + // LOGGER.warning("Could not store new skill, it's null!"); // } } catch (Exception e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7513,7 +7513,7 @@ public final class L2PcInstance extends L2Playable } catch (SQLException e) { - _log.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error could not store char skills: " + e.getMessage(), e); } } @@ -7541,7 +7541,7 @@ public final class L2PcInstance extends L2Playable if (skill == null) { - _log.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); + LOGGER.warning("Skipped null skill Id: " + id + " Level: " + level + " while restoring player skills for playerObjId: " + getObjectId()); continue; } @@ -7564,7 +7564,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore character " + this + " skills: " + e.getMessage(), e); } } @@ -7622,7 +7622,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } } @@ -7688,7 +7688,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " Item Reuse data: " + e.getMessage(), e); } } @@ -7751,7 +7751,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character " + this + " hennas.", e); } // Calculate henna modifiers of this player. @@ -7819,7 +7819,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed removing character henna.", e); + LOGGER.log(Level.SEVERE, "Failed removing character henna.", e); } // Calculate Henna modifiers of this L2PcInstance @@ -7901,7 +7901,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed saving character henna.", e); + LOGGER.log(Level.SEVERE, "Failed saving character henna.", e); } // Task for henna duration @@ -8054,7 +8054,7 @@ public final class L2PcInstance extends L2Playable if (isLocked()) { - _log.warning("Player " + getName() + " tried to restart/logout during class change."); + LOGGER.warning("Player " + getName() + " tried to restart/logout during class change."); return false; } @@ -8398,7 +8398,7 @@ public final class L2PcInstance extends L2Playable if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { - _log.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); + LOGGER.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + "."); sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -9521,7 +9521,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e); return false; } @@ -9636,7 +9636,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not modify sub class for " + getName() + " to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -9724,7 +9724,7 @@ public final class L2PcInstance extends L2Playable final L2PcTemplate pcTemplate = PlayerTemplateData.getInstance().getTemplate(classId); if (pcTemplate == null) { - _log.severe("Missing template for classId: " + classId); + LOGGER.severe("Missing template for classId: " + classId); throw new Error(); } // Set the template of the L2PcInstance @@ -9807,7 +9807,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not switch " + getName() + "'s sub class to class index " + classIndex + ": " + e.getMessage(), e); return false; } } @@ -10047,7 +10047,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10059,7 +10059,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLogin(this), this); @@ -10544,7 +10544,7 @@ public final class L2PcInstance extends L2Playable if ((item == null) || (item.getOwnerId() != getObjectId())) { - _log.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); + LOGGER.finest(getObjectId() + ": player tried to " + action + " item he is not owner of"); return false; } @@ -10686,7 +10686,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) @@ -10694,13 +10694,13 @@ public final class L2PcInstance extends L2Playable { if (!isOnline()) { - _log.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); + LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } setOnlineStatus(false, true); } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10712,7 +10712,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10724,7 +10724,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove combat flag @@ -10747,7 +10747,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10760,7 +10760,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10772,7 +10772,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Recommendations must be saved before task (timer) is canceled @@ -10782,7 +10782,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop the HP/MP/CP Regeneration task (scheduled tasks) try @@ -10791,7 +10791,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -10800,7 +10800,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Stop crafting, if in progress @@ -10810,7 +10810,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Cancel Attak or Cast @@ -10820,7 +10820,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isChannelized()) @@ -10841,7 +10841,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // If a Party is in progress, leave it (and festival party) @@ -10853,7 +10853,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10888,7 +10888,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // returns pet to control item } @@ -10906,7 +10906,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10926,7 +10926,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10946,7 +10946,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // remove player from instance @@ -10959,7 +10959,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -10969,7 +10969,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its inventory and remove them from the world @@ -10979,7 +10979,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } // Update database with items in its warehouse and remove them from the world @@ -10989,7 +10989,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (Config.WAREHOUSE_CACHE) { @@ -11002,7 +11002,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } try @@ -11011,7 +11011,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } if (isCursedWeaponEquipped()) @@ -11022,7 +11022,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } } @@ -11070,7 +11070,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on deleteMe() notifyFriends: " + e.getMessage(), e); } // Stop all passives and augment options @@ -11764,7 +11764,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); + LOGGER.log(Level.SEVERE, "Failed to store Pet [NpcId: " + petId + "] data", e); } } } @@ -11893,7 +11893,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update character teleport bookmark data: " + e.getMessage(), e); } } @@ -11913,7 +11913,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not delete character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -12062,7 +12062,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not insert character teleport bookmark data: " + e.getMessage(), e); } sendPacket(new ExGetBookMarkInfoPacket(this)); } @@ -12083,7 +12083,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); + LOGGER.log(Level.SEVERE, "Failed restoing character teleport bookmark.", e); } } @@ -12302,7 +12302,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error found in " + getName() + "'s FriendList: " + e.getMessage(), e); } } @@ -12399,7 +12399,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); + LOGGER.log(Level.SEVERE, "Could not store recipe shop for playerId " + getObjectId() + ": ", e); } } } @@ -12425,7 +12425,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore recipe shop list data for playerId: " + getObjectId(), e); } } @@ -12674,12 +12674,12 @@ public final class L2PcInstance extends L2Playable if (nextLevel == -1) { - _log.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from player " + toString()); removeSkill(skill, true); // there is no lower skill } else { - _log.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } @@ -12825,7 +12825,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not check Items in Pet Inventory for playerId: " + getObjectId(), e); } } @@ -12869,7 +12869,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e); } } @@ -12889,7 +12889,7 @@ public final class L2PcInstance extends L2Playable } catch (Exception e) { - _log.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); + LOGGER.log(Level.SEVERE, "Could not update Recommendations for player: " + getObjectId(), e); } } @@ -13658,14 +13658,14 @@ public final class L2PcInstance extends L2Playable { sendMessage("The command " + command.substring(6) + " does not exist!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, getAccessLevel())) { sendMessage("You don't have the access rights to use this command!"); - _log.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); + LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 5718895451..ca24302555 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -576,7 +576,7 @@ public class L2PetInstance extends L2Summon final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); if (handler == null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + LOGGER.warning("No item handler registered for item ID: " + target.getId() + "."); } else { @@ -771,7 +771,7 @@ public class L2PetInstance extends L2Summon if (removedItem == null) { - _log.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); + LOGGER.warning("Couldn't destroy pet control item for " + owner + " pet: " + this + " evolve: " + evolve); } else { @@ -1059,7 +1059,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not store pet effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store pet effect data: ", e); } } @@ -1098,7 +1098,7 @@ public class L2PetInstance extends L2Summon } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { @@ -1404,7 +1404,7 @@ public class L2PetInstance extends L2Summon } else { - _log.warning("Pet control item null, for pet: " + toString()); + LOGGER.warning("Pet control item null, for pet: " + toString()); } super.setName(name); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 2c113f3992..fcd45fb1b0 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -376,7 +376,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not store summon effect data: ", e); + LOGGER.log(Level.WARNING, "Could not store summon effect data: ", e); } } @@ -442,7 +442,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore " + this + " active effect data: " + e.getMessage(), e); } finally { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index 26bc7343bc..14138d4ce2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class L2VillageMasterInstance extends L2NpcInstance { - private static Logger _log = Logger.getLogger(L2VillageMasterInstance.class.getName()); + private static Logger LOGGER = Logger.getLogger(L2VillageMasterInstance.class.getName()); /** * Creates a village master. @@ -363,7 +363,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } catch (Exception NumberFormatException) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Wrong numeric values for command " + command); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Wrong numeric values for command " + command); } Set subsAvailable = null; @@ -504,7 +504,7 @@ public class L2VillageMasterInstance extends L2NpcInstance */ if (!player.getFloodProtectors().getSubclass().tryPerformAction("add subclass")) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); return; } @@ -570,7 +570,7 @@ public class L2VillageMasterInstance extends L2NpcInstance */ if (!player.getFloodProtectors().getSubclass().tryPerformAction("change class")) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); return; } @@ -650,7 +650,7 @@ public class L2VillageMasterInstance extends L2NpcInstance */ if (!player.getFloodProtectors().getSubclass().tryPerformAction("change class")) { - _log.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(L2VillageMasterInstance.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); return; } @@ -1226,7 +1226,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } catch (PatternSyntaxException e) { - _log.warning("ERROR: Wrong pattern for clan name!"); + LOGGER.warning("ERROR: Wrong pattern for clan name!"); pattern = Pattern.compile(".*"); } return pattern.matcher(name).matches(); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java index b448f021a8..d2cd097234 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/PetStat.java @@ -93,7 +93,7 @@ public class PetStat extends SummonStat { if (getActiveChar() != null) { - _log.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); + LOGGER.warning("Pet objectId:" + getActiveChar().getObjectId() + ", NpcId:" + getActiveChar().getId() + ", level:" + level + " is missing data from pets_stats table!"); } throw e; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index aaecadf5c5..222d29419e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp public class PlayableStat extends CharStat { - protected static final Logger _log = Logger.getLogger(PlayableStat.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PlayableStat.class.getName()); public PlayableStat(L2Playable activeChar) { @@ -195,7 +195,7 @@ public class PlayableStat extends CharStat { if (value < 0) { - _log.warning("wrong usage"); + LOGGER.warning("wrong usage"); return false; } final long currentSp = getSp(); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index 352a7719ae..0ce091c546 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.stats.Stats; public class CharStatus { - protected static final Logger _log = Logger.getLogger(CharStatus.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(CharStatus.class.getName()); private final L2Character _activeChar; @@ -449,7 +449,7 @@ public class CharStatus } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java index 3fa6773fd2..1b1003f76d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/npc/RandomAnimationTask.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc; */ public class RandomAnimationTask implements Runnable { - private static final Logger _log = Logger.getLogger(RandomAnimationTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RandomAnimationTask.class.getName()); private final L2Npc _npc; private boolean _stopTask; @@ -70,7 +70,7 @@ public class RandomAnimationTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); + LOGGER.log(Level.SEVERE, "Execution of RandomAnimationTask has failed.", e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java index 39eaa5b37a..755ae87ebc 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/npc/trap/TrapTask.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction; */ public class TrapTask implements Runnable { - private static final Logger _log = Logger.getLogger(TrapTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(TrapTask.class.getName()); private static final int TICK = 1000; // 1s private final L2TrapInstance _trap; @@ -65,7 +65,7 @@ public class TrapTask implements Runnable } catch (Exception e) { - _log.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.severe(TrapTask.class.getSimpleName() + ": " + e.getMessage()); _trap.unSummon(); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java index 1801510a6b..a08fc73212 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.LeaveWorld; */ public class GameGuardCheckTask implements Runnable { - private static final Logger _log = Logger.getLogger(GameGuardCheckTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GameGuardCheckTask.class.getName()); private final L2PcInstance _player; @@ -47,7 +47,7 @@ public class GameGuardCheckTask implements Runnable if ((client != null) && !client.isAuthedGG() && _player.isOnline()) { AdminData.getInstance().broadcastMessageToGMs("Client " + client + " failed to reply GameGuard query and is being kicked!"); - _log.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); + LOGGER.info("Client " + client + " failed to reply GameGuard query and is being kicked!"); client.close(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index 23cfffc2bb..fc78d6a4db 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.Disconnection; */ public final class IllegalPlayerActionTask implements Runnable { - private static final Logger _log = Logger.getLogger("audit"); + private static final Logger LOGGER = Logger.getLogger("audit"); private final String _message; private final IllegalActionPunishmentType _punishment; @@ -74,7 +74,7 @@ public final class IllegalPlayerActionTask implements Runnable @Override public void run() { - _log.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); + LOGGER.info("AUDIT, " + _message + ", " + _actor + ", " + _punishment); AdminData.getInstance().broadcastMessageToGMs(_message); if (!_actor.isGM()) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index 8b4bd27212..73c3219140 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PetFeedTask implements Runnable { - private static final Logger _log = Logger.getLogger(PetFeedTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PetFeedTask.class.getName()); private final L2PcInstance _player; @@ -99,7 +99,7 @@ public class PetFeedTask implements Runnable } catch (Exception e) { - _log.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); + LOGGER.log(Level.SEVERE, "Mounted Pet [NpcId: " + _player.getMountNpcId() + "] a feed task error has occurred", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/Announcement.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/Announcement.java index 3873f71d14..4e5aa84b0f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/Announcement.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/Announcement.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class Announcement implements IAnnouncement { - protected static final Logger _log = Logger.getLogger(Announcement.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Announcement.class.getName()); private static final String INSERT_QUERY = "INSERT INTO announcements (type, content, author) VALUES (?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE announcements SET type = ?, content = ?, author = ? WHERE id = ?"; @@ -125,7 +125,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -145,7 +145,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -162,7 +162,7 @@ public class Announcement implements IAnnouncement } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't remove announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java index f85c9affc0..a18af9fc50 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,7 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; - private static final Logger _log = Logger.getLogger(AnnouncementType.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) { @@ -40,7 +40,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent id specified: " + id + "!", new IllegalStateException()); return NORMAL; } @@ -53,7 +53,7 @@ public enum AnnouncementType return type; } } - _log.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); + LOGGER.log(Level.WARNING, AnnouncementType.class.getSimpleName() + ": Unexistent name specified: " + name + "!", new IllegalStateException()); return NORMAL; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index a47ba1a0a5..ebee3cd82c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -114,7 +114,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store announcement: ", e); return false; } return true; @@ -137,7 +137,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update announcement: ", e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/buylist/Product.java index 97571235ed..03b1a51b6b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; */ public final class Product { - private static final Logger _log = Logger.getLogger(Product.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Product.class.getName()); private final int _buyListId; private final L2Item _item; @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - _log.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index 8d2e52b55c..6eefb3679e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public final class ConditionPlayerGrade extends Condition { - protected static final Logger _log = Logger.getLogger(ConditionPlayerGrade.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ConditionPlayerGrade.class.getName()); // conditional values public static final int COND_NO_GRADE = 0x0001; public static final int COND_D_GRADE = 0x0002; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 90ac2108aa..805960c36b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public abstract class AbstractEffect { - protected static final Logger _log = Logger.getLogger(AbstractEffect.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEffect.class.getName()); private int _ticks; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index 6892d0798a..ce7a68dcc7 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -56,7 +56,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class BlockCheckerEngine { - protected static final Logger _log = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -309,7 +309,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); + LOGGER.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); } } @@ -417,7 +417,7 @@ public final class BlockCheckerEngine // Wrong arena passed, stop event if (_arena == -1) { - _log.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); + LOGGER.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); return; } _isStarted = true; @@ -508,7 +508,7 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Spawn the block carrying girl @@ -530,8 +530,8 @@ public final class BlockCheckerEngine } catch (Exception e) { - _log.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } @@ -558,7 +558,7 @@ public final class BlockCheckerEngine { if (_spawn == null) { - _log.warning("HBCE: Block Carrying Girl is null"); + LOGGER.warning("HBCE: Block Carrying Girl is null"); return; } SpawnTable.getInstance().deleteSpawn(_spawn, false); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java index a6faf0b0df..4fa38d85d4 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public final class Castle extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Castle.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Castle.class.getName()); private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); @@ -212,7 +212,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -232,7 +232,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; } @@ -542,7 +542,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } oldOwner.setCastleId(0); // Unset has castle flag for old owner for (L2PcInstance member : oldOwner.getOnlineMembers(0)) @@ -683,7 +683,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleData(): " + e.getMessage(), e); } } @@ -704,7 +704,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.loadFunctions(): " + e.getMessage(), e); } } @@ -724,7 +724,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Castle.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -801,7 +801,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadCastleDoorUpgrade(): " + e.getMessage(), e); } } @@ -821,7 +821,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -848,7 +848,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setDoorUpgrade(int doorId, int ratio, int castleId): " + e.getMessage(), e); } } } @@ -891,7 +891,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -1042,7 +1042,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage()); } } @@ -1086,7 +1086,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -1110,7 +1110,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): " + e.getMessage(), e); } } final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(getResidenceId()).get(towerIndex); @@ -1135,7 +1135,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -1184,7 +1184,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(Castle.class.getSimpleName() + ": " + e.getMessage()); return; } spawn.setX(holder.getX()); @@ -1219,7 +1219,7 @@ public final class Castle extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } _castleSide = side; Broadcast.toAllOnlinePlayers(new ExCastleState(this)); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Couple.java index c31232e232..c40e7d454a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Couple.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class Couple { - private static final Logger _log = Logger.getLogger(Couple.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Couple.class.getName()); private int _Id = 0; private int _player1Id = 0; @@ -67,7 +67,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); } } @@ -99,7 +99,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); } } @@ -117,7 +117,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); } } @@ -131,7 +131,7 @@ public class Couple } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Duel.java index d601203f8d..826a7beece 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class Duel { - protected static final Logger _log = Logger.getLogger(Duel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Duel.class.getName()); public static final int DUELSTATE_NODUEL = 0; public static final int DUELSTATE_DUELLING = 1; @@ -223,7 +223,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel task!", e); } } } @@ -266,7 +266,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel start task!", e); } } } @@ -291,7 +291,7 @@ public class Duel } catch (Exception e) { - _log.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); + LOGGER.log(Level.SEVERE, "There has been a problem while runing a duel end task!", e); } } } @@ -994,7 +994,7 @@ public class Duel { if ((player != _playerA) && (player != _playerB)) { - _log.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); + LOGGER.warning("Error in onPlayerDefeat(): player is not part of this 1vs1 duel"); } if (_playerA == player) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java index 75ec9236b8..aaece02dae 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -63,7 +63,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Fort extends AbstractResidence { - protected static final Logger _log = Logger.getLogger(Fort.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Fort.class.getName()); private final List _doors = new ArrayList<>(); private L2StaticObjectInstance _flagPole = null; @@ -227,7 +227,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); } } } @@ -370,7 +370,7 @@ public final class Fort extends AbstractResidence { if (clan == null) { - _log.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); + LOGGER.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); return false; } @@ -396,7 +396,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); } removeOwner(true); } @@ -496,7 +496,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); } } @@ -606,7 +606,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); } } @@ -627,7 +627,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); } } @@ -647,7 +647,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); } } @@ -744,7 +744,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); } } @@ -775,7 +775,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); } } @@ -844,7 +844,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(L2Clan clan): " + e.getMessage(), e); } } @@ -968,7 +968,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); } } } @@ -1008,7 +1008,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); } } @@ -1154,7 +1154,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1183,7 +1183,7 @@ public final class Fort extends AbstractResidence } catch (Exception e) { - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1213,7 +1213,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1249,7 +1249,7 @@ public final class Fort extends AbstractResidence catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 053af69e9d..80e02260d5 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class FortSiege implements Siegable { - protected static final Logger _log = Logger.getLogger(FortSiege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(FortSiege.class.getName()); // SQL private static final String DELETE_FORT_SIEGECLANS_BY_CLAN_ID = "DELETE FROM fortsiege_clans WHERE fort_id = ? AND clan_id = ?"; @@ -82,7 +82,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleEndSiegeTask() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -169,12 +169,12 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); + LOGGER.warning(getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); } } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleStartSiegeTask() for Fort: " + _fortInst.getName() + " " + e.getMessage(), e); } } } @@ -195,7 +195,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -218,7 +218,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: ScheduleSiegeRestore() for Fort: " + _fort.getName() + " " + e.getMessage(), e); } } } @@ -293,7 +293,7 @@ public class FortSiege implements Siegable getFort().setVisibleFlag(true); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -343,7 +343,7 @@ public class FortSiege implements Siegable announceToPlayer(sm); saveFortSiege(); - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -533,7 +533,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -689,7 +689,7 @@ public class FortSiege implements Siegable } else { - _log.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); } } } @@ -816,7 +816,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception on removeSiegeClan: " + e.getMessage(), e); } } @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new FortSiege.ScheduleStartSiegeTask(60), 0); } - _log.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); } } } @@ -1013,7 +1013,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1066,7 +1066,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1092,7 +1092,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan): " + e.getMessage(), e); } } @@ -1120,7 +1120,7 @@ public class FortSiege implements Siegable catch (Exception e) { // problem with initializing spawn, go to next one - _log.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": FortSiege.spawnCommander: Spawn could not be initialized: " + e.getMessage(), e); } } @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/L2Event.java index be28d47897..dbdbdae0e9 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/L2Event.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/L2Event.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class L2Event { - protected static final Logger _log = Logger.getLogger(L2Event.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2Event.class.getName()); public static EventState eventState = EventState.OFF; public static String _eventName = ""; public static String _eventCreator = ""; @@ -151,7 +151,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); } } } @@ -187,7 +187,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); } } @@ -308,7 +308,7 @@ public class L2Event } catch (Exception e) { - _log.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); } } @@ -399,7 +399,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event participation, an error has occured."; } @@ -475,7 +475,7 @@ public class L2Event } catch (Exception e) { - _log.warning("L2Event: " + e.getMessage()); + LOGGER.warning("L2Event: " + e.getMessage()); return "Cannot start event, an error has occured."; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Siege.java index 8987391e4f..52c64946e9 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -70,7 +70,7 @@ import com.l2jmobius.gameserver.util.Broadcast; public class Siege implements Siegable { - protected static final Logger _log = Logger.getLogger(Siege.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Siege.class.getName()); // typeId's public static final byte OWNER = -1; @@ -142,7 +142,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -215,7 +215,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": ", e); } } } @@ -781,7 +781,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeClan(): " + e.getMessage(), e); } } @@ -798,7 +798,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: clearSiegeWaitingClan(): " + e.getMessage(), e); } } @@ -983,7 +983,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: removeSiegeClan(): " + e.getMessage(), e); } } @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - _log.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); loadSiegeClan(); @@ -1275,7 +1275,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: loadSiegeClan(): " + e.getMessage(), e); } } @@ -1360,7 +1360,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeDate(): " + e.getMessage(), e); } } @@ -1428,7 +1428,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: saveSiegeClan(L2Clan clan, int typeId, boolean isUpdateRegistration): " + e.getMessage(), e); } } @@ -1482,7 +1482,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn control tower! " + e); } _controlTowerCount = _controlTowers.size(); } @@ -1506,7 +1506,7 @@ public class Siege implements Siegable } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); + LOGGER.warning(getClass().getSimpleName() + ": Cannot spawn flame tower! " + e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 26d733e4c1..12551f22ba 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -161,7 +161,7 @@ import com.l2jmobius.gameserver.util.MinionList; */ public abstract class AbstractScript extends ManagedScript implements IEventTimerEvent, IEventTimerCancel { - protected static final Logger _log = Logger.getLogger(AbstractScript.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractScript.class.getName()); private final Map> _registeredIds = new ConcurrentHashMap<>(); private final Queue _listeners = new PriorityBlockingQueue<>(); private volatile TimerExecutor _timerExecutor; @@ -185,7 +185,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime public void onTimerEvent(String event, StatsSet params, L2Npc npc, L2PcInstance player) { - _log.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); + LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } public void onTimerCancel(String event, StatsSet params, L2Npc npc, L2PcInstance player) @@ -229,17 +229,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final EventType eventType = listener.value(); if (method.getParameterCount() != 1) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter count is 1 but found: " + method.getParameterCount()); continue; } else if (!eventType.isEventClass(method.getParameterTypes()[0])) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected parameter to be type of: " + eventType.getEventClass().getSimpleName() + " but found: " + method.getParameterTypes()[0].getSimpleName()); continue; } else if (!eventType.isReturnClass(method.getReturnType())) { - _log.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); + LOGGER.warning(getClass().getSimpleName() + ": Non properly defined annotation listener on method: " + method.getName() + " expected return type to be one of: " + Arrays.toString(eventType.getReturnClasses()) + " but found: " + method.getReturnType().getSimpleName()); continue; } @@ -275,7 +275,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final Range range = (Range) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -291,7 +291,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } @@ -306,12 +306,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final NpcLevelRange range = (NpcLevelRange) annotation; if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -329,12 +329,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (range.from() > range.to()) { - _log.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); + LOGGER.warning(getClass().getSimpleName() + ": Wrong " + annotation.getClass().getSimpleName() + " from is higher then to!"); continue; } else if (type != ListenerRegisterType.NPC) { - _log.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); + LOGGER.warning(getClass().getSimpleName() + ": ListenerRegisterType " + type + " for " + annotation.getClass().getSimpleName() + " NPC is expected!"); continue; } @@ -391,7 +391,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -409,7 +409,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addKillId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_KILL, ListenerRegisterType.NPC, npcIds); @@ -499,7 +499,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -517,7 +517,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addFirstTalkId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_FIRST_TALK, ListenerRegisterType.NPC, npcIds); @@ -536,7 +536,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -553,7 +553,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addTalkId for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_TALK, ListenerRegisterType.NPC, npcIds); @@ -596,7 +596,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -613,7 +613,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addStartNpc for non existing NPC: " + id + "!"); } } return registerDummy(EventType.ON_NPC_QUEST_START, ListenerRegisterType.NPC, npcIds); @@ -633,7 +633,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -651,7 +651,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSkillSeeId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_SEE, ListenerRegisterType.NPC, npcIds); @@ -671,7 +671,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -689,7 +689,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpellFinishedId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SKILL_FINISHED, ListenerRegisterType.NPC, npcIds); @@ -709,7 +709,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -727,7 +727,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addSpawnId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_NPC_SPAWN, ListenerRegisterType.NPC, npcIds); @@ -1018,7 +1018,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1036,7 +1036,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { if (NpcData.getInstance().getTemplate(id) == null) { - _log.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found addAttackId for non existing NPC: " + id + "!"); } } return registerConsumer(callback, EventType.ON_ATTACKABLE_ATTACK, ListenerRegisterType.NPC, npcIds); @@ -1723,7 +1723,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } @@ -1843,7 +1843,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } default: { - _log.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); + LOGGER.warning(getClass().getSimpleName() + ": Unhandled register type: " + registerType); } } } @@ -2216,7 +2216,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime if ((x == 0) && (y == 0)) { - _log.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); + LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!"); return null; } @@ -2258,7 +2258,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime } catch (Exception e) { - _log.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); + LOGGER.warning("Could not spawn NPC #" + npcId + "; error: " + e.getMessage()); } return null; @@ -3138,7 +3138,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called openDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (!door.isOpen()) { @@ -3156,7 +3156,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime final L2DoorInstance door = getDoor(doorId, instanceId); if (door == null) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": called closeDoor(" + doorId + ", " + instanceId + "); but door wasnt found!", new NullPointerException()); } else if (door.isOpen()) { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java index c25f5189f6..231cef15b4 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/EventDispatcher.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public final class EventDispatcher { - private static final Logger _log = Logger.getLogger(EventDispatcher.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EventDispatcher.class.getName()); protected EventDispatcher() { @@ -83,7 +83,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -172,7 +172,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't notify event " + event.getClass().getSimpleName(), e); } return null; } @@ -237,7 +237,7 @@ public final class EventDispatcher } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception during notification of event: " + event.getClass().getSimpleName() + " listener: " + listener.getClass().getSimpleName(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java index 4b21e92c36..97dc1b1142 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/AnnotationEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class AnnotationEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(AnnotationEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AnnotationEventListener.class.getName()); private final Method _callback; public AnnotationEventListener(ListenersContainer container, EventType type, Method callback, Object owner, int priority) @@ -54,7 +54,7 @@ public class AnnotationEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + _callback.getName() + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java index 0d5b4a601c..56fb7b03ec 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/FunctionEventListener.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.returns.AbstractEventReturn; */ public class FunctionEventListener extends AbstractEventListener { - private static final Logger _log = Logger.getLogger(FunctionEventListener.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FunctionEventListener.class.getName()); private final Function _callback; @SuppressWarnings("unchecked") @@ -50,7 +50,7 @@ public class FunctionEventListener extends AbstractEventListener } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while invoking " + event + " on " + getOwner(), e); } return null; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index cb65209f93..1501c166e8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public abstract class ItemContainer { - protected static final Logger _log = Logger.getLogger(ItemContainer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ItemContainer.class.getName()); protected final Map _items = new ConcurrentHashMap<>(); @@ -287,7 +287,7 @@ public abstract class ItemContainer final L2Item template = ItemTable.getInstance().getTemplate(itemId); if (template == null) { - _log.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); + LOGGER.log(Level.WARNING, (actor != null ? "[" + actor.getName() + "] " : "") + "Invalid ItemId requested: ", itemId); return null; } @@ -702,7 +702,7 @@ public abstract class ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index cb2d9362ba..5bb5770412 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -139,7 +139,7 @@ public class Mail extends ItemContainer } catch (Exception e) { - _log.log(Level.WARNING, "could not restore container:", e); + LOGGER.log(Level.WARNING, "could not restore container:", e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index 7fce82d4af..c7a3128aa9 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; public class PcInventory extends Inventory { - private static final Logger _log = Logger.getLogger(PcInventory.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PcInventory.class.getName()); private final L2PcInstance _owner; private L2ItemInstance _adena; @@ -761,7 +761,7 @@ public class PcInventory extends Inventory } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e); } return paperdoll; } @@ -974,7 +974,7 @@ public class PcInventory extends Inventory { if ((type != EtcItemType.ARROW) && (type != EtcItemType.BOLT)) { - _log.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); + LOGGER.log(Level.WARNING, type.toString(), " which is not arrow type passed to PlayerInstance.reduceArrowCount()"); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java index 37e0216702..ded347d03a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcRefund.java @@ -71,7 +71,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "addItem()", e); + LOGGER.log(Level.SEVERE, "addItem()", e); } } @@ -93,7 +93,7 @@ public class PcRefund extends ItemContainer } catch (Exception e) { - _log.log(Level.SEVERE, "deleteMe()", e); + LOGGER.log(Level.SEVERE, "deleteMe()", e); } _items.clear(); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index a988fe1fec..c5a70ee9be 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.items.type.ItemType; */ public abstract class AbstractEnchantItem { - protected static final Logger _log = Logger.getLogger(AbstractEnchantItem.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); private static final ItemType[] ENCHANT_TYPES = new ItemType[] { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java index d4af9b02f5..2a7e5652dc 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.holders.RangeChanceHolder; */ public final class EnchantItemGroup { - private static final Logger _log = Logger.getLogger(EnchantItemGroup.class.getName()); + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); private final List _chances = new ArrayList<>(); private final String _name; @@ -68,10 +68,10 @@ public final class EnchantItemGroup return holder.getChance(); } } - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name, new IllegalStateException()); return _chances.get(_chances.size() - 1).getChance(); } - _log.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); return -1; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index b93772addc..e0e75f064f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -142,14 +142,14 @@ public final class EnchantScroll extends AbstractEnchantItem { if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) { - _log.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); return -1; } final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); if (group == null) { - _log.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); return -1; } return group.getChance(enchantItem.getEnchantLevel()); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 076cfe435a..2ca4331a23 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -1281,7 +1281,7 @@ public final class L2ItemInstance extends L2Object */ public static class ScheduleConsumeManaTask implements Runnable { - private static final Logger _log = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScheduleConsumeManaTask.class.getName()); private final L2ItemInstance _shadowItem; public ScheduleConsumeManaTask(L2ItemInstance item) @@ -1302,7 +1302,7 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 7556af343a..46097d99e5 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public abstract class AbstractOlympiadGame { - protected static final Logger _log = Logger.getLogger(AbstractOlympiadGame.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AbstractOlympiadGame.class.getName()); protected static final Logger _logResults = Logger.getLogger("olympiad"); protected static final String POINTS = "olympiad_points"; @@ -186,7 +186,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return false; } return true; @@ -287,7 +287,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -340,7 +340,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -387,7 +387,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "playerStatusBack()", e); + LOGGER.log(Level.WARNING, "playerStatusBack()", e); } } @@ -434,7 +434,7 @@ public abstract class AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java index 6069b35ec8..714e479916 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OlympiadGameManager implements Runnable { - private static final Logger _log = Logger.getLogger(OlympiadGameManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(OlympiadGameManager.class.getName()); private static final int STADIUM_COUNT = 80; // TODO dynamic private volatile boolean _battleStarted = false; @@ -60,7 +60,7 @@ public class OlympiadGameManager implements Runnable _tasks.add(stadium); } - _log.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); + LOGGER.info("Olympiad System: Loaded " + _tasks.size() + " stadiums."); } public static OlympiadGameManager getInstance() @@ -188,7 +188,7 @@ public class OlympiadGameManager implements Runnable { OlympiadManager.getInstance().clearRegistered(); _battleStarted = false; - _log.info("Olympiad System: All current games finished."); + LOGGER.info("Olympiad System: All current games finished."); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 2108adfcb2..c82b326970 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -167,7 +167,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return false; } return result; @@ -388,7 +388,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (_playerTwo.isDefaulted()) @@ -415,7 +415,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } if (winside == 1) @@ -431,7 +431,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -536,7 +536,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); return; } } @@ -673,7 +673,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (Exception e) { - _log.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on validateWinner(): " + e.getMessage(), e); } } @@ -758,7 +758,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame } catch (SQLException e) { - _log.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); + LOGGER.log(Level.SEVERE, "SQL exception while saving olympiad fight.", e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index d18e278286..8ef4db814e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class OlympiadGameTask implements Runnable { - protected static final Logger _log = Logger.getLogger(OlympiadGameTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(OlympiadGameTask.class.getName()); private static final int[] TELEPORT_TO_ARENA_TIMES = { @@ -163,7 +163,7 @@ public final class OlympiadGameTask implements Runnable { if ((game != null) && (_state != GameState.IDLE)) { - _log.warning("Attempt to overwrite non-finished game in state " + _state); + LOGGER.warning("Attempt to overwrite non-finished game in state " + _state); return; } @@ -352,14 +352,14 @@ public final class OlympiadGameTask implements Runnable case CLEANUP: case IDLE: { - _log.warning("Unable to return players back in town, exception: " + e.getMessage()); + LOGGER.warning("Unable to return players back in town, exception: " + e.getMessage()); _state = GameState.IDLE; _game = null; return; } } - _log.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in " + _state + ", trying to port players back: " + e.getMessage(), e); _state = GameState.GAME_STOPPED; ThreadPool.schedule(this, 1000); } @@ -417,7 +417,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -446,7 +446,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return false; } @@ -463,7 +463,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } return true; @@ -480,7 +480,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -489,7 +489,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -498,7 +498,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -507,7 +507,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } @@ -522,7 +522,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -531,7 +531,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -540,7 +540,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -549,7 +549,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } try @@ -558,7 +558,7 @@ public final class OlympiadGameTask implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index d4720828f5..037b43e894 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; */ public class PunishmentTask implements Runnable { - protected static final Logger _log = Logger.getLogger(PunishmentTask.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(PunishmentTask.class.getName()); private static final String INSERT_QUERY = "INSERT INTO punishments (`key`, `affect`, `type`, `expiration`, `reason`, `punishedBy`) VALUES (?, ?, ?, ?, ?, ?)"; private static final String UPDATE_QUERY = "UPDATE punishments SET expiration = ? WHERE id = ?"; @@ -203,7 +203,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't store punishment task for: " + _affect + " " + _key, e); } } @@ -230,7 +230,7 @@ public class PunishmentTask implements Runnable } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update punishment task for: " + _affect + " " + _key + " id: " + _id, e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 495a0d648b..0a5994e0d5 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.util.Broadcast; */ public class LongTimeEvent extends Quest { - protected Logger _log = Logger.getLogger(getClass().getName()); + protected Logger LOGGER = Logger.getLogger(getClass().getName()); protected String _eventName; boolean _enableShrines = false; @@ -86,17 +86,17 @@ public class LongTimeEvent extends Quest if (_eventPeriod.isWithinRange(new Date())) { startEvent(); - _log.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); + LOGGER.info("Event " + _eventName + " active till " + _eventPeriod.getEndDate()); } else if (_eventPeriod.getStartDate().after(new Date())) { final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); - _log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); + LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } else { - _log.info("Event " + _eventName + " has passed... Ignored "); + LOGGER.info("Event " + _eventName + " has passed... Ignored "); } } } @@ -179,19 +179,19 @@ public class LongTimeEvent extends Quest if (ItemTable.getInstance().getTemplate(itemId) == null) { - _log.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: " + itemId + " is wrong item id, item was not added in droplist"); continue; } if (minCount > maxCount) { - _log.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - min greater than max, item was not added in droplist"); continue; } if ((finalChance < 10000) || (finalChance > 1000000)) { - _log.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); + LOGGER.warning(getScriptName() + " event: item " + itemId + " - incorrect drop chance, item was not added in droplist"); continue; } @@ -199,7 +199,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml droplist block for " + getScriptName() + " event"); } } } @@ -221,7 +221,7 @@ public class LongTimeEvent extends Quest if (NpcData.getInstance().getTemplate(npcId) == null) { - _log.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); + LOGGER.warning(getScriptName() + " event: " + npcId + " is wrong NPC id, NPC was not added in spawnlist"); continue; } @@ -229,7 +229,7 @@ public class LongTimeEvent extends Quest } catch (NumberFormatException nfe) { - _log.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); + LOGGER.warning("Wrong number format in config.xml spawnlist block for " + getScriptName() + " event"); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java index 0c8a3b044b..b1ef6c3f23 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -84,7 +84,7 @@ import com.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class Quest extends AbstractScript implements IIdentifiable { - public static final Logger _log = Logger.getLogger(Quest.class.getName()); + public static final Logger LOGGER = Logger.getLogger(Quest.class.getName()); /** Map containing lists of timers from the name of the timer. */ private volatile Map> _questTimers = null; @@ -523,7 +523,7 @@ public class Quest extends AbstractScript implements IIdentifiable { showError(trigger.getActingPlayer(), e); } - _log.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTrapAction() in notifyTrapAction(): " + e.getMessage(), e); return; } if (trigger.getActingPlayer() != null) @@ -543,7 +543,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSpawn() in notifySpawn(): " + e.getMessage(), e); } } @@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onTeleport() in notifyTeleport(): " + e.getMessage(), e); } } @@ -864,7 +864,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onEventReceived() in notifyEventReceived(): " + e.getMessage(), e); } } @@ -933,7 +933,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Execution on onOlympiadMatchFinish() in notifyOlympiadMatch(): " + e.getMessage(), e); } } @@ -948,7 +948,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onMoveFinished() in notifyMoveFinished(): " + e.getMessage(), e); } } @@ -963,7 +963,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onNodeArrived() in notifyNodeArrived(): " + e.getMessage(), e); } } @@ -978,7 +978,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onRouteFinished() in notifyRouteFinished(): " + e.getMessage(), e); } } @@ -995,7 +995,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onCanSeeMe() in notifyOnCanSeeMe(): " + e.getMessage(), e); } return false; } @@ -1008,7 +1008,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); return; } } @@ -1513,10 +1513,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public boolean showError(L2PcInstance player, Throwable t) { - _log.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); + LOGGER.log(Level.WARNING, getScriptFile().toAbsolutePath().toString(), t); if (t.getMessage() == null) { - _log.warning(getClass().getSimpleName() + ": " + t.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + t.getMessage()); } if ((player != null) && player.getAccessLevel().isGm()) { @@ -1607,7 +1607,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - _log.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1638,7 +1638,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - _log.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); @@ -1656,7 +1656,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1680,7 +1680,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not insert char quest:", e); + LOGGER.log(Level.WARNING, "could not insert char quest:", e); } } @@ -1703,7 +1703,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not update char quest:", e); + LOGGER.log(Level.WARNING, "could not update char quest:", e); } } @@ -1724,7 +1724,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Unable to delete char quest!", e); + LOGGER.log(Level.WARNING, "Unable to delete char quest!", e); } } @@ -1748,7 +1748,7 @@ public class Quest extends AbstractScript implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "could not delete char quest:", e); + LOGGER.log(Level.WARNING, "could not delete char quest:", e); } } @@ -2804,7 +2804,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if ((id != 0) && (ItemTable.getInstance().getTemplate(id) == null)) { - _log.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); + LOGGER.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!"); } } _questItemIds = items; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 23c0acc8d1..40aa1878fd 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.util.Util; */ public final class QuestState { - protected static final Logger _log = Logger.getLogger(QuestState.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestState.class.getName()); /** The name of the quest of this QuestState */ private final String _questName; @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - _log.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - _log.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 64f6afb219..4013de0733 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class QuestTimer { - protected static final Logger _log = Logger.getLogger(QuestTimer.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(QuestTimer.class.getName()); public class ScheduleTimerTask implements Runnable { @@ -48,7 +48,7 @@ public class QuestTimer } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java index 64f04389a2..1c7ac4a6ab 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/shuttle/L2ShuttleEngine.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance; */ public class L2ShuttleEngine implements Runnable { - private static final Logger _log = Logger.getLogger(L2ShuttleEngine.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2ShuttleEngine.class.getName()); private static final int DELAY = 15 * 1000; @@ -117,7 +117,7 @@ public class L2ShuttleEngine implements Runnable } catch (Exception e) { - _log.log(Level.INFO, e.getMessage(), e); + LOGGER.log(Level.INFO, e.getMessage(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java index 6148235551..19a1a61b20 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class Skill implements IIdentifiable { - private static final Logger _log = Logger.getLogger(Skill.class.getName()); + private static final Logger LOGGER = Logger.getLogger(Skill.class.getName()); /** Skill ID. */ private final int _id; @@ -295,7 +295,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); + LOGGER.log(Level.WARNING, "Bad data in rideState for skill " + this + "!", e); } } } @@ -426,7 +426,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); + LOGGER.log(Level.WARNING, "Skill ID[" + _id + "] Expected AbnormalType for abnormalResists but found " + s, e); } } } @@ -1139,7 +1139,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTarget(): " + e.getMessage(), e); } } activeChar.sendMessage("Target type of skill " + this + " is not currently handled."); @@ -1168,7 +1168,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.getTargetsAffected(): " + e.getMessage(), e); } } activeChar.sendMessage("Target affect scope of skill " + this + " is not currently handled."); @@ -1196,7 +1196,7 @@ public final class Skill implements IIdentifiable } catch (Exception e) { - _log.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Exception in Skill.forEachTargetAffected(): " + e.getMessage(), e); } } else @@ -1608,7 +1608,7 @@ public final class Skill implements IIdentifiable } else { - _log.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); + LOGGER.warning("Invalid AbnormalVisualEffect(" + this + ") found for Skill(" + aveString + ")"); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 66b9f7e4b2..8e607be078 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SkillChannelizer implements Runnable { - private static final Logger _log = Logger.getLogger(SkillChannelizer.class.getName()); + private static final Logger LOGGER = Logger.getLogger(SkillChannelizer.class.getName()); private final L2Character _channelizer; private List _channelized; @@ -72,7 +72,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); + LOGGER.warning("Character: " + toString() + " is attempting to channel skill but he already does!"); return; } @@ -86,7 +86,7 @@ public class SkillChannelizer implements Runnable // Verify for same status. if (!isChanneling()) { - _log.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); + LOGGER.warning("Character: " + toString() + " is attempting to stop channel skill but he does not!"); return; } @@ -192,7 +192,7 @@ public class SkillChannelizer implements Runnable final Skill channeledSkill = SkillData.getInstance().getSkill(skill.getChannelingSkillId(), skillLevel); if (channeledSkill == null) { - _log.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); + LOGGER.warning(getClass().getSimpleName() + ": Non existent channeling skill requested: " + skill); _channelizer.abortCast(); return; } @@ -229,7 +229,7 @@ public class SkillChannelizer implements Runnable } catch (Exception e) { - _log.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); + LOGGER.log(Level.WARNING, "Error while channelizing skill: " + skill + " channelizer: " + _channelizer + " channelized: " + channelized, e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java index 7d6f856c18..8b91fc77d2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/AccountVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class AccountVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(AccountVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(AccountVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM account_gsdata WHERE account_name = ?"; @@ -64,7 +64,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _accountName, e); return false; } finally @@ -107,7 +107,7 @@ public class AccountVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _accountName, e); return false; } finally @@ -134,7 +134,7 @@ public class AccountVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _accountName, e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java index 390e2f166a..50fcf2ab6f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/ClanVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ClanVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ClanVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ClanVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM clan_variables WHERE clanId = ?"; @@ -64,7 +64,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -107,7 +107,7 @@ public class ClanVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -134,7 +134,7 @@ public class ClanVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java index bcd7f557fd..c7ba2ff071 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/ItemVariables.java @@ -31,7 +31,7 @@ import com.l2jmobius.commons.database.DatabaseFactory; */ public class ItemVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(ItemVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ItemVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM item_variables WHERE id = ?"; @@ -69,7 +69,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); + LOGGER.log(Level.WARNING, ItemVariables.class.getSimpleName() + ": Couldn't select variables count for: " + objectId, e); return false; } return true; @@ -93,7 +93,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + _objectId, e); return false; } finally @@ -136,7 +136,7 @@ public class ItemVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + _objectId, e); return false; } finally @@ -163,7 +163,7 @@ public class ItemVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + _objectId, e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java index 999b4cdd64..85508e687b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class PlayerVariables extends AbstractVariables { - private static final Logger _log = Logger.getLogger(PlayerVariables.class.getName()); + private static final Logger LOGGER = Logger.getLogger(PlayerVariables.class.getName()); // SQL Queries. private static final String SELECT_QUERY = "SELECT * FROM character_variables WHERE charId = ?"; @@ -90,7 +90,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore variables for: " + getPlayer(), e); return false; } finally @@ -133,7 +133,7 @@ public class PlayerVariables extends AbstractVariables } catch (SQLException e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't update variables for: " + getPlayer(), e); return false; } finally @@ -160,7 +160,7 @@ public class PlayerVariables extends AbstractVariables } catch (Exception e) { - _log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't delete variables for: " + getPlayer(), e); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java index 8a54b645b0..adfcec2ca5 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java @@ -66,7 +66,7 @@ public abstract class L2ZoneRespawn extends L2ZoneType } default: { - _log.warning(getClass().getSimpleName() + ": Unknown location type: " + type); + LOGGER.warning(getClass().getSimpleName() + ": Unknown location type: " + type); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 3beea85891..a6790a61d9 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public abstract class L2ZoneType extends ListenersContainer { - protected static final Logger _log = Logger.getLogger(L2ZoneType.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(L2ZoneType.class.getName()); private final int _id; protected L2ZoneForm _zone; @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - _log.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 043a66b6f4..33d3bb8723 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -113,7 +113,7 @@ public final class L2EffectZone extends L2ZoneType final String[] skillSplit = skill.split("-"); if (skillSplit.length != 2) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skill + "\""); } else { @@ -125,7 +125,7 @@ public final class L2EffectZone extends L2ZoneType { if (!skill.isEmpty()) { - _log.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); + LOGGER.warning(getClass().getSimpleName() + ": invalid config property -> skillsIdLvl \"" + skillSplit[0] + "\"" + skillSplit[1]); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/L2GameClient.java index 56940c6507..7cdbe1bb0a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -63,7 +63,7 @@ import io.netty.channel.ChannelHandlerContext; public final class L2GameClient extends ChannelInboundHandler { protected static final Logger LOGGER = Logger.getLogger(L2GameClient.class.getName()); - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private final int _objectId; @@ -111,13 +111,13 @@ public final class L2GameClient extends ChannelInboundHandler final InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress(); _addr = address.getAddress(); _channel = ctx.channel(); - LOG_ACCOUNTING.finer("Client Connected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Connected: " + ctx.channel()); } @Override public void channelInactive(ChannelHandlerContext ctx) { - LOG_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); + LOGGER_ACCOUNTING.finer("Client Disconnected: " + ctx.channel()); LoginServerThread.getInstance().sendLogout(getAccountName()); IdFactory.getInstance().releaseId(getObjectId()); @@ -339,7 +339,7 @@ public final class L2GameClient extends ChannelInboundHandler } } - LOG_ACCOUNTING.info("Delete, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Delete, " + objectId + ", " + this); return CharacterDeleteFailType.NONE; } @@ -362,7 +362,7 @@ public final class L2GameClient extends ChannelInboundHandler LOGGER.log(Level.SEVERE, "Error restoring character.", e); } - LOG_ACCOUNTING.info("Restore, " + objectId + ", " + this); + LOGGER_ACCOUNTING.info("Restore, " + objectId + ", " + this); } public static void deleteCharByObjId(int objid) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/NpcStringId.java index c6e5863ec5..d2cb39cac2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/NpcStringId.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { - private static final Logger _log = Logger.getLogger(NpcStringId.class.getName()); + private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; private static Map VALUES = new HashMap<>(); @@ -35254,7 +35254,7 @@ public final class NpcStringId } catch (Exception e) { - _log.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); + LOGGER.log(Level.WARNING, "NpcStringId: Failed field access for '" + field.getName() + "'", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Action.java index f92d2c5e23..6c3399eea7 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Action.java @@ -154,7 +154,7 @@ public final class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - _log.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); + LOGGER.warning(getClass().getSimpleName() + ": Character: " + activeChar.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 3159a555e3..1ffd75d20c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -58,7 +58,7 @@ public final class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - _log.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +68,7 @@ public final class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - _log.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + LOGGER.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_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 2471b37509..969aea0360 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.util.Util; @SuppressWarnings("unused") public final class CharacterCreate implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cSdddddddddddd private String _name; @@ -124,7 +124,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - _log.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -132,7 +132,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - _log.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -140,7 +140,7 @@ public final class CharacterCreate implements IClientIncomingPacket if ((_hairColor > 3) || (_hairColor < 0)) { - _log.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; @@ -252,7 +252,7 @@ public final class CharacterCreate implements IClientIncomingPacket initNewChar(client, newChar); - LOG_ACCOUNTING.info("Created new character, " + newChar + ", " + client); + LOGGER_ACCOUNTING.info("Created new character, " + newChar + ", " + client); } private static boolean isValidName(String text) @@ -308,7 +308,7 @@ public final class CharacterCreate implements IClientIncomingPacket final L2ItemInstance item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - _log.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index cd62eefdba..1dab2d81f8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -75,7 +75,7 @@ public final class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error:", e); + LOGGER.log(Level.SEVERE, "Error:", e); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index c7b59f3d6d..3d0b8dfcb3 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ServerClose; */ public class CharacterSelect implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); // cd private int _charSlot; @@ -175,7 +175,7 @@ public class CharacterSelect implements IClientIncomingPacket client.getActiveCharLock().unlock(); } - LOG_ACCOUNTING.info("Logged in, " + client); + LOGGER_ACCOUNTING.info("Logged in, " + client); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5c18755798..689f42e143 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public final class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = activeChar.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - _log.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } activeChar.stopMovie(); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 263536ab73..3c28b311bf 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -141,7 +141,7 @@ public class EnterWorld implements IClientIncomingPacket final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { - _log.warning("EnterWorld failed! activeChar returned 'null'."); + LOGGER.warning("EnterWorld failed! activeChar returned 'null'."); Disconnection.of(client).defaultSequence(false); return; } @@ -172,7 +172,7 @@ public class EnterWorld implements IClientIncomingPacket // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) // { - // _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); + // LOGGER.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); // } if (Config.PVP_COLOR_SYSTEM_ENABLED && !Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 29a07243b9..7638c7332e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -43,9 +43,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("[T1:ExGetOnAirShip] x: " + _x); - _log.info("[T1:ExGetOnAirShip] y: " + _y); - _log.info("[T1:ExGetOnAirShip] z: " + _z); - _log.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + 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); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index 4f62846be3..c9f4c0b539 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index 472f1051b3..b0f55887ee 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -27,5 +27,5 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger _log = Logger.getLogger(IClientIncomingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java index 8b2f68f220..d29291657e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class Logout implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -55,7 +55,7 @@ public final class Logout implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 33481d8d96..29b4d8f81b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -147,7 +147,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - _log.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -155,14 +155,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) { - _log.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - _log.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -190,7 +190,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - _log.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -355,7 +355,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -453,7 +453,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -616,7 +616,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - _log.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index c9e6a88cec..6d400a1191 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.KeyPacket; */ public final class ProtocolVersion implements IClientIncomingPacket { - private static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + private static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private int _version; @@ -51,7 +51,7 @@ public final class ProtocolVersion implements IClientIncomingPacket } else if (!Config.PROTOCOL_LIST.contains(_version)) { - LOG_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); + LOGGER_ACCOUNTING.warning("Wrong protocol version " + _version + ", " + client); client.setProtocolOk(false); client.close(new KeyPacket(client.enableCrypt(), 0)); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index f6f598bddf..f8258f7f20 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -106,7 +106,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 32000)) { Util.handleIllegalPlayerAction(activeChar, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - _log.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + activeChar); return; } @@ -125,7 +125,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - _log.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + activeChar.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -135,7 +135,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning("Player " + activeChar.getName() + " is trying to learn a skill that already knows, Id: " + _id + " level: " + _level + "!"); return; } @@ -517,7 +517,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } default: { - _log.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index daaae05884..4feb5ae11d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -56,7 +56,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -80,7 +80,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - _log.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } @@ -90,11 +90,11 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket { if (prevSkillLevel == _level) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); } else if (prevSkillLevel != (_level - 1)) { - _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); + LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for skill Id: " + _id + " level " + _level + " without knowing it's previous level!"); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index baddc853ee..b54bca60ed 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -93,7 +93,7 @@ public final class RequestActionUse implements IClientIncomingPacket if (!(Arrays.binarySearch(allowedActions, _actionId) >= 0)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); + LOGGER.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation().orElse(null)); return; } } @@ -143,7 +143,7 @@ public final class RequestActionUse implements IClientIncomingPacket } default: { - _log.warning(activeChar.getName() + ": unhandled action type " + _actionId); + LOGGER.warning(activeChar.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 01c8b0c67f..138c70f9d8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -131,7 +131,7 @@ public final class RequestBlock implements IClientIncomingPacket } default: { - _log.info("Unknown 0xA9 block type: " + _type); + LOGGER.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 9efcd27f7c..e13a26f4ec 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -161,7 +161,7 @@ public final class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - _log.warning("ERROR, no price found .. wrong buylist ??"); + LOGGER.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index a85b1019cc..7621a7029e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -86,7 +86,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - _log.warning("Player " + activeChar.getName() + " sent empty bypass!"); + LOGGER.warning("Player " + activeChar.getName() + " sent empty bypass!"); Disconnection.of(client, activeChar).defaultSequence(false); return; } @@ -107,7 +107,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket bypassOriginId = activeChar.validateHtmlAction(_command); if (bypassOriginId == -1) { - _log.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); + LOGGER.warning("Player " + activeChar.getName() + " sent non cached bypass: '" + _command + "'"); return; } @@ -192,7 +192,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - _log.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); } } else if (_command.startsWith("_match")) @@ -285,13 +285,13 @@ public final class RequestBypassToServer implements IClientIncomingPacket } else { - _log.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - _log.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); + LOGGER.log(Level.WARNING, "Exception processing bypass from player " + activeChar.getName() + ": " + _command, e); if (activeChar.isGM()) { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 8d17f67975..61b88962de 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -61,7 +61,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket if (activeChar == null) { - _log.finer("RequestCrystalizeItem: activeChar was null"); + LOGGER.finer("RequestCrystalizeItem: activeChar was null"); return; } @@ -90,7 +90,7 @@ public final class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((activeChar.getRace() != Race.DWARF) && (activeChar.getClassId().ordinal() != 117) && (activeChar.getClassId().ordinal() != 55)) { - _log.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); + LOGGER.info("Player " + activeChar + " used crystalize with classid: " + activeChar.getClassId().ordinal()); } return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index f48efc3a6d..9805ae3e39 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -171,7 +171,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not delete pet objectid: ", e); + LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 2c89d4fd7e..33c87254a1 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -185,7 +185,7 @@ public final class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - _log.warning(msg); + LOGGER.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index ac44a0a77b..2bbdb8626a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -42,6 +42,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 27e73c4de3..522eb7716c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -60,7 +60,7 @@ public final class RequestExCubeGameChangeTeam implements IClientIncomingPacket } case -1: { - // Remove Player (me) + // Remove Player (me) } { final int team = HandysBlockCheckerManager.getInstance().getHolder(_arena).getPlayerTeam(player); @@ -74,7 +74,7 @@ public final class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - _log.warning("Wrong Cube Game Team ID: " + _team); + LOGGER.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index ca230610ed..ea96e75807 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -64,7 +64,7 @@ public final class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - _log.warning("Unknown Cube Game Answer ID: " + _answer); + LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index 2aac09d8a2..87679b1211 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -34,6 +34,6 @@ public final class RequestExFishRanking implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestExFishRanking"); + LOGGER.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 1690c6d2f0..412be1caa7 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -87,7 +87,7 @@ public final class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 31e55b54f3..0937ce580d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -72,7 +72,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - _log.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 352bc99c12..c031e965ea 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -43,7 +43,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - _log.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); + LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getActiveChar() + ")"); if (client.getActiveChar() == null) { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index 8c3b8157b7..d480f5057e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -44,6 +44,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - _log.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + LOGGER.warning("Player " + activeChar + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index ffc9040acd..0feb646e91 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -79,7 +79,7 @@ public final class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index ee5433c9e0..186e2f91a4 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -119,7 +119,7 @@ public final class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - _log.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 07f79b8511..ce3ebea643 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -67,7 +67,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 4055e9b188..016c2378d4 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -52,7 +52,7 @@ public final class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - _log.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + activeChar); } client.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 6950da9b0c..a9704d4032 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -50,7 +50,7 @@ public final class RequestHennaItemRemoveInfo implements IClientIncomingPacket final L2Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - _log.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); + LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + activeChar); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 2d53b32472..4a405e7538 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -75,7 +75,7 @@ public final class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - _log.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); + LOGGER.warning(getClass().getSimpleName() + ": Player " + activeChar + " requested Henna Draw remove without any henna."); client.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index d8a598fa60..53afe57b35 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -49,20 +49,20 @@ public final class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - _log.warning("Player " + actor.getName() + " sent empty html link!"); + LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - _log.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - _log.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 3d797b889a..c8a621359f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -50,7 +50,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (activeChar.getObjectId() != _objectId) { - _log.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + LOGGER.warning("Player: " + activeChar + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 1f6b539929..cab42128f7 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public final class RequestMagicSkillUse implements IClientIncomingPacket activeChar.sendPacket(ActionFailed.STATIC_PACKET); if (_magicId > 0) { - _log.warning("Skill Id " + _magicId + " not found in player: " + activeChar); + LOGGER.warning("Skill Id " + _magicId + " not found in player: " + activeChar); } return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 0ab61c25b8..11ed417b33 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -72,7 +72,7 @@ public final class RequestOustPledgeMember implements IClientIncomingPacket final L2ClanMember member = clan.getClanMember(_target); if (member == null) { - _log.warning("Target (" + _target + ") is not member of the clan"); + LOGGER.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayerInstance().isInCombat()) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index b703480e20..b87741c610 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -37,6 +37,6 @@ public final class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(L2GameClient client) { - _log.info("C5: RequestPCCafeCouponUse: S: " + _str); + LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index aa71b73eb6..05962263f7 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -119,7 +119,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -168,7 +168,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -176,7 +176,7 @@ public class RequestPackageSend implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 9ef482c27c..57d27eec76 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -136,7 +136,7 @@ public final class RequestPetUseItem implements IClientIncomingPacket else { activeChar.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - _log.warning("No item handler registered for itemId: " + item.getId()); + LOGGER.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index deef71c1ba..29ab10a108 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -74,7 +74,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - _log.severe("Error while saving petition feedback"); + LOGGER.severe("Error while saving petition feedback"); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 7e97a40c3f..48d2cecb87 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -29,8 +29,8 @@ import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2MerchantInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.buylist.ProductList; import com.l2jmobius.gameserver.model.buylist.Product; +import com.l2jmobius.gameserver.model.buylist.ProductList; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.items.L2Armor; import com.l2jmobius.gameserver.model.items.L2Item; @@ -74,7 +74,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.SEVERE, "", e); + LOGGER.log(Level.SEVERE, "", e); } } } @@ -153,7 +153,7 @@ public final class RequestPreviewItem implements IClientIncomingPacket final L2MerchantInstance merchant = (target instanceof L2MerchantInstance) ? (L2MerchantInstance) target : null; if (merchant == null) { - _log.warning("Null merchant!"); + LOGGER.warning("Null merchant!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index b6f2892f96..a20bb3d197 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -160,7 +160,7 @@ public final class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - _log.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index d61109b205..d76415c39f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -144,7 +144,7 @@ public final class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + LOGGER.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_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9ab82245e8..01373d760d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -194,7 +194,7 @@ public final class RequestRefundItem implements IClientIncomingPacket final L2ItemInstance item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - _log.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); continue; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 8b253257c5..1a4ea38608 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack } else { - _log.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } activeChar.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 23c4edd13c..f8749dfd8b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.util.OfflineTradeUtil; */ public final class RequestRestart implements IClientIncomingPacket { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); @Override public boolean read(L2GameClient client, PacketReader packet) @@ -58,7 +58,7 @@ public final class RequestRestart implements IClientIncomingPacket return; } - LOG_ACCOUNTING.info("Logged out, " + client); + LOGGER_ACCOUNTING.info("Logged out, " + client); if (!OfflineTradeUtil.enteredOfflineMode(player)) { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 7ba8a189b4..e08c984b59 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -91,7 +91,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else if (!activeChar.isDead()) { - _log.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); + LOGGER.warning("Living player [" + activeChar.getName() + "] called RestartPointPacket! Ban this player!"); return; } @@ -143,7 +143,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getHideoutId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CLANHALL); @@ -171,7 +171,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } else { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -194,7 +194,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if ((activeChar.getClan() == null) || (activeChar.getClan().getFortId() == 0)) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.FORTRESS); @@ -223,7 +223,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.SIEGEFLAG); @@ -233,7 +233,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket { if (!activeChar.isGM() && !activeChar.getInventory().haveItemForSelfResurrection()) { - _log.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + LOGGER.warning("Player [" + activeChar.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (activeChar.isGM() || activeChar.destroyItemByItemId("Feather", 10649, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13300, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13128, 1, activeChar, false)) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9cbb114e88..e53df987df 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -323,14 +323,14 @@ public final class RequestSendPost implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - _log.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final L2ItemInstance newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - _log.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + LOGGER.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_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 092a91fe40..5e2215c60a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -54,17 +54,17 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((activeChar == null) || (castle == null)) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != activeChar.getClanId())) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); return; } else if (!activeChar.isClanLeader()) { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); return; } else if (!castle.getIsTimeRegistrationOver()) @@ -81,12 +81,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - _log.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + activeChar + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index 5ab9bf7732..220b673807 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -109,7 +109,7 @@ public final class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - _log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); + LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -117,7 +117,7 @@ public final class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - _log.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); + LOGGER.warning(activeChar.getName() + ": sending empty text. Possible packet hack!"); activeChar.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(activeChar).defaultSequence(false); return; @@ -224,7 +224,7 @@ public final class Say2 implements IClientIncomingPacket } else { - _log.info("No handler registered for ChatType: " + _type + " Player: " + client); + LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -271,7 +271,7 @@ public final class Say2 implements IClientIncomingPacket if (item == null) { - _log.info(client + " trying publish item which doesnt own! ID:" + id); + LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -279,7 +279,7 @@ public final class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - _log.info(client + " sent invalid publish item msg! ID:" + id); + LOGGER.info(client + " sent invalid publish item msg! ID:" + id); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 84eccf9f7a..2255ca3502 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -67,14 +67,14 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket activeChar.sendMessage("The command " + command.substring(6) + " does not exists!"); } - _log.warning("No handler registered for admin command '" + command + "'"); + LOGGER.warning("No handler registered for admin command '" + command + "'"); return; } if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); + LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 60c0402b18..237686ac3b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -128,7 +128,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (item == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -175,7 +175,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -187,7 +187,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket final L2ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager); if (newItem == null) { - _log.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 9c76eb1086..dc8836ed4b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -167,13 +167,13 @@ public final class SendWareHouseWithDrawList implements IClientIncomingPacket final L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final L2ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - _log.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java index 5999d7d02c..8ae98bd315 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -272,7 +272,7 @@ public final class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(activeChar, item, _ctrlPressed)) diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java index 1441d46716..622d6d2d7f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java @@ -64,8 +64,8 @@ public class ValidatePosition implements IClientIncomingPacket if (Config.DEVELOPER) { - _log.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); - _log.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); + LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading); + LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + activeChar.getHeading()); } if ((_x == 0) && (_y == 0)) @@ -191,7 +191,7 @@ public class ValidatePosition implements IClientIncomingPacket { if (Config.DEVELOPER) { - _log.info(activeChar.getName() + ": Synchronizing position Server --> Client"); + LOGGER.info(activeChar.getName() + ": Synchronizing position Server --> Client"); } activeChar.sendPacket(new ValidateLocation(activeChar)); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 8cf9b2f3b5..8cf139d7c4 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -57,7 +57,7 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_durationType < 0) || (_durationType > 3)) { - _log.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 659b237448..5e0ad65f1a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -101,7 +101,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - _log.warning(activeChar + ": tried to crystallize " + item.getItem()); + LOGGER.warning(activeChar + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index f3d9054f6a..213b230d0b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -102,7 +102,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); } } else diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 6165c3b460..2897338b82 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -101,7 +101,7 @@ public final class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "could not del friend objectid: ", e); + LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 29a252aa5e..94715a15c1 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -94,7 +94,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index c51d4f158a..de2ad9cf73 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -77,7 +77,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - _log.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index a7553a343f..5d89208157 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -61,7 +61,7 @@ public final class RequestBRProductList implements IClientIncomingPacket } default: { - _log.warning(player + " send unhandled product list type: " + _type); + LOGGER.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index 15e8b936a5..7939daf42a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -71,7 +71,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { activeChar.sendMessage("That zone is not supported yet!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on zone with no map id set"); return; } @@ -79,7 +79,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { activeChar.sendMessage("This zone is not handled yet!!"); - _log.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); + LOGGER.warning(getClass().getSimpleName() + ": " + activeChar + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index 4c9c106a52..b6ac83ea82 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -60,7 +60,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket activeChar.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - _log.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); + LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance(activeChar, true, false)); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java index eb24a578fb..9d28cd837c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java @@ -29,7 +29,7 @@ import com.l2jmobius.commons.network.BaseSendablePacket; */ public class BlowFishKey extends BaseSendablePacket { - private static Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + private static Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param blowfishKey @@ -48,7 +48,7 @@ public class BlowFishKey extends BaseSendablePacket } catch (Exception e) { - _log.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While encrypting blowfish key for transmision (Crypt error): " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index d7f5a56cb6..4b509229e8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -75,7 +75,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - _log.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); _html = html.substring(0, 17200); } @@ -93,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - _log.warning("missing html page " + path); + LOGGER.warning("missing html page " + path); return false; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index df42fbe646..10ce97b46c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -135,7 +135,7 @@ public abstract class AbstractMessagePacket> // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - _log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 58bbb84eef..2538126f0a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { - private static Logger _log = Logger.getLogger(CharSelectionInfo.class.getName()); + private static Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); private final String _loginName; private final int _sessionId; private int _activeId; @@ -241,7 +241,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } return new CharSelectInfoPackage[0]; } @@ -266,7 +266,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e); } } @@ -378,7 +378,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket } catch (Exception e) { - _log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 36ef7cd289..1c046a085c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -46,7 +46,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 03c64d3f83..a90b288eb1 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -44,7 +44,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - _log.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index ef264eb715..4c7aa6f70c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -54,7 +54,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - _log.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + LOGGER.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_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 8b2fe9aa5e..ba2ae9f9f1 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger _log = Logger.getLogger(IClientOutgoingPacket.class.getName()); + Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); int[] PAPERDOLL_ORDER = new int[] { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index f21611bb50..d0f43d0ffe 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -56,7 +56,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - _log.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 6397e049ac..401b7e072c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -58,7 +58,7 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - _log.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); + LOGGER.info("Character: " + _activeChar + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 44a9997fb2..562b2ccd31 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -78,7 +78,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - _log.warning("Null owner for castle: " + _castle.getName()); + LOGGER.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 1082f31974..77c787e1be 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -55,7 +55,7 @@ public final class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_activeChar.getActiveWarehouse() == null) { - _log.warning("error while sending withdraw request to: " + _activeChar.getName()); + LOGGER.warning("error while sending withdraw request to: " + _activeChar.getName()); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/script/DateRange.java index 3b8acae352..1a16f0bd49 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/script/DateRange.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; */ public class DateRange { - protected static final Logger _log = Logger.getLogger(DateRange.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(DateRange.class.getName()); private final Date _startDate, _endDate; public DateRange(Date from, Date to) @@ -47,7 +47,7 @@ public class DateRange } catch (ParseException e) { - _log.log(Level.WARNING, "Invalid Date Format.", e); + LOGGER.log(Level.WARNING, "Invalid Date Format.", e); } } return new DateRange(null, null); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/script/ScriptDocument.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/script/ScriptDocument.java index eacfe5baf8..672c90e094 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/script/ScriptDocument.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/script/ScriptDocument.java @@ -33,7 +33,7 @@ import org.xml.sax.SAXException; */ public class ScriptDocument { - private static final Logger _log = Logger.getLogger(ScriptDocument.class.getName()); + private static final Logger LOGGER = Logger.getLogger(ScriptDocument.class.getName()); private Document _document; private final String _name; @@ -57,17 +57,17 @@ public class ScriptDocument { x = sxe.getException(); } - _log.warning(getClass().getSimpleName() + ": " + x.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + x.getMessage()); } catch (ParserConfigurationException pce) { // Parser with specified options can't be built - _log.log(Level.WARNING, "", pce); + LOGGER.log(Level.WARNING, "", pce); } catch (IOException ioe) { // I/O error - _log.log(Level.WARNING, "", ioe); + LOGGER.log(Level.WARNING, "", ioe); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java index 1779779829..8344576a3e 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java @@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util; */ public class SecondaryPasswordAuth { - private final Logger _log = Logger.getLogger(SecondaryPasswordAuth.class.getName()); + private final Logger LOGGER = Logger.getLogger(SecondaryPasswordAuth.class.getName()); private final L2GameClient _activeClient; private String _password; @@ -96,7 +96,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); } } @@ -104,7 +104,7 @@ public class SecondaryPasswordAuth { if (passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced savePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -127,7 +127,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing password.", e); + LOGGER.log(Level.SEVERE, "Error while writing password.", e); return false; } _password = password; @@ -147,7 +147,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while writing wrong attempts.", e); + LOGGER.log(Level.SEVERE, "Error while writing wrong attempts.", e); return false; } return true; @@ -157,7 +157,7 @@ public class SecondaryPasswordAuth { if (!passwordExist()) { - _log.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); + LOGGER.warning("[SecondaryPasswordAuth]" + _activeClient.getAccountName() + " forced changePassword"); Disconnection.of(_activeClient).defaultSequence(false); return false; } @@ -185,7 +185,7 @@ public class SecondaryPasswordAuth } catch (Exception e) { - _log.log(Level.SEVERE, "Error while reading password.", e); + LOGGER.log(Level.SEVERE, "Error while reading password.", e); return false; } @@ -210,7 +210,7 @@ public class SecondaryPasswordAuth { LoginServerThread.getInstance().sendTempBan(_activeClient.getAccountName(), _activeClient.getConnectionAddress().getHostAddress(), SecondaryAuthData.getInstance().getBanTime()); LoginServerThread.getInstance().sendMail(_activeClient.getAccountName(), "SATempBan", _activeClient.getConnectionAddress().getHostAddress(), Integer.toString(SecondaryAuthData.getInstance().getMaxAttempts()), Long.toString(SecondaryAuthData.getInstance().getBanTime()), SecondaryAuthData.getInstance().getRecoveryLink()); - _log.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); + LOGGER.warning(_activeClient.getAccountName() + " - (" + _activeClient.getConnectionAddress().getHostAddress() + ") has inputted the wrong password " + _wrongAttempts + " times in row."); insertWrongAttempt(0); _activeClient.close(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_BAN, SecondaryAuthData.getInstance().getMaxAttempts())); } @@ -258,11 +258,11 @@ public class SecondaryPasswordAuth } catch (NoSuchAlgorithmException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Algorythm"); } catch (UnsupportedEncodingException e) { - _log.severe("[SecondaryPasswordAuth]Unsupported Encoding"); + LOGGER.severe("[SecondaryPasswordAuth]Unsupported Encoding"); } return null; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index 9f26c91ac6..49f8a70c08 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; */ public class AttackStanceTaskManager { - protected static final Logger _log = Logger.getLogger(AttackStanceTaskManager.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(AttackStanceTaskManager.class.getName()); protected static final Map _attackStanceTasks = new ConcurrentHashMap<>(); @@ -132,7 +132,7 @@ public class AttackStanceTaskManager catch (Exception e) { // Unless caught here, players remain in attack positions. - _log.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/Broadcast.java index 419eb6295a..dfaa95d5d0 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/Broadcast.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.RelationChanged; */ public final class Broadcast { - private static Logger _log = Logger.getLogger(Broadcast.class.getName()); + private static Logger LOGGER = Logger.getLogger(Broadcast.class.getName()); /** * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character that have the Character targeted.
@@ -101,7 +101,7 @@ public final class Broadcast } catch (NullPointerException e) { - _log.log(Level.WARNING, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } }); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/Evolve.java index 7fae394d24..66a22f62fd 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/Evolve.java @@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class Evolve { - protected static final Logger _log = Logger.getLogger(Evolve.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(Evolve.class.getName()); public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) { @@ -287,7 +287,7 @@ public final class Evolve } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } @@ -314,7 +314,7 @@ public final class Evolve } catch (Throwable e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java index f005fca2ea..7c4f9c2185 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -40,7 +40,7 @@ public final class FloodProtectorAction /** * Logger */ - private static final Logger _log = Logger.getLogger(FloodProtectorAction.class.getName()); + private static final Logger LOGGER = Logger.getLogger(FloodProtectorAction.class.getName()); /** * Client for this instance of flood protector. */ @@ -94,7 +94,7 @@ public final class FloodProtectorAction if ((curTick < _nextGameTick) || _punishmentInProgress) { - if (_config.LOG_FLOODING && !_logged && _log.isLoggable(Level.WARNING)) + if (_config.LOG_FLOODING && !_logged && LOGGER.isLoggable(Level.WARNING)) { log(" called command ", command, " ~", String.valueOf((_config.FLOOD_PROTECTION_INTERVAL - (_nextGameTick - curTick)) * GameTimeController.MILLIS_IN_TICK), " ms after previous command"); _logged = true; @@ -124,7 +124,7 @@ public final class FloodProtectorAction return false; } - if ((_count.get() > 0) && _config.LOG_FLOODING && _log.isLoggable(Level.WARNING)) + if ((_count.get() > 0) && _config.LOG_FLOODING && LOGGER.isLoggable(Level.WARNING)) { log(" issued ", String.valueOf(_count), " extra requests within ~", String.valueOf(_config.FLOOD_PROTECTION_INTERVAL * GameTimeController.MILLIS_IN_TICK), " ms"); } @@ -142,7 +142,7 @@ public final class FloodProtectorAction { Disconnection.of(_client).defaultSequence(false); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log("kicked for flooding"); } @@ -154,7 +154,7 @@ public final class FloodProtectorAction private void banAccount() { PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -176,7 +176,7 @@ public final class FloodProtectorAction PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } - if (_log.isLoggable(Level.WARNING)) + if (LOGGER.isLoggable(Level.WARNING)) { log(" jailed for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); } @@ -238,6 +238,6 @@ public final class FloodProtectorAction Arrays.stream(lines).forEach(output::append); - _log.warning(output.toString()); + LOGGER.warning(output.toString()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/GMAudit.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/GMAudit.java index c2ee25069b..c2a5593953 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/GMAudit.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/GMAudit.java @@ -31,7 +31,7 @@ import com.l2jmobius.Config; */ public class GMAudit { - private static final Logger _log = Logger.getLogger(GMAudit.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GMAudit.class.getName()); static { new File("log/GMAudit").mkdirs(); @@ -61,7 +61,7 @@ public class GMAudit } catch (IOException e) { - _log.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); + LOGGER.log(Level.SEVERE, "GMAudit for GM " + gmName + " could not be saved: ", e); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 7394f489e8..ecc40e644b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.L2GameClient; */ public final class OfflineTradeUtil { - protected static final Logger LOG_ACCOUNTING = Logger.getLogger("accounting"); + protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting"); private OfflineTradeUtil() { @@ -145,7 +145,7 @@ public final class OfflineTradeUtil } Disconnection.of(player).storeMe().close(false); - LOG_ACCOUNTING.info("Entering offline mode, " + client); + LOGGER_ACCOUNTING.info("Entering offline mode, " + client); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/FloodProtectedListener.java index df39b38769..d046a0f65c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/FloodProtectedListener.java @@ -32,7 +32,7 @@ import com.l2jmobius.Config; */ public abstract class FloodProtectedListener extends Thread { - private final Logger _log = Logger.getLogger(FloodProtectedListener.class.getName()); + private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName()); private final Map _floodProtection = new ConcurrentHashMap<>(); private ServerSocket _serverSocket; @@ -70,7 +70,7 @@ public abstract class FloodProtectedListener extends Thread fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) { - _log.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); + LOGGER.warning("Potential Flood from " + connection.getInetAddress().getHostAddress()); } fConnection.isFlooding = true; continue; @@ -78,7 +78,7 @@ public abstract class FloodProtectedListener extends Thread if (fConnection.isFlooding) // if connection was flooding server but now passed the check { fConnection.isFlooding = false; - _log.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); + LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } fConnection.lastConnection = System.currentTimeMillis(); } @@ -102,7 +102,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException io) { - _log.log(Level.INFO, "", io); + LOGGER.log(Level.INFO, "", io); } break; } @@ -145,7 +145,7 @@ public abstract class FloodProtectedListener extends Thread } else { - _log.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); + LOGGER.warning("Removing a flood protection for a GameServer that was not in the connection map??? :" + ip); } } @@ -157,7 +157,7 @@ public abstract class FloodProtectedListener extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java index 767e0b2326..78eadc9019 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters; */ public class GameServerThread extends Thread { - protected static final Logger _log = Logger.getLogger(GameServerThread.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(GameServerThread.class.getName()); private final Socket _connection; private InputStream _in; private OutputStream _out; @@ -69,7 +69,7 @@ public class GameServerThread extends Thread _connectionIPAddress = _connection.getInetAddress().getHostAddress(); if (GameServerThread.isBannedGameserverIP(_connectionIPAddress)) { - _log.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); + LOGGER.info("GameServerRegistration: IP Address " + _connectionIPAddress + " is on Banned IP list."); forceClose(LoginServerFail.REASON_IP_BANNED); // ensure no further processing for this connection return; @@ -92,7 +92,7 @@ public class GameServerThread extends Thread if ((lengthHi < 0) || _connection.isClosed()) { - _log.finer("LoginServerThread: Login terminated the connection."); + LOGGER.finer("LoginServerThread: Login terminated the connection."); break; } @@ -110,7 +110,7 @@ public class GameServerThread extends Thread if (receivedBytes != (length - 2)) { - _log.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); + LOGGER.warning("Incomplete Packet is sent to the server, closing connection.(LS)"); break; } @@ -119,7 +119,7 @@ public class GameServerThread extends Thread checksumOk = NewCrypt.verifyChecksum(data); if (!checksumOk) { - _log.warning("Incorrect packet checksum, closing connection (LS)"); + LOGGER.warning("Incorrect packet checksum, closing connection (LS)"); return; } @@ -130,14 +130,14 @@ public class GameServerThread extends Thread { final String serverName = getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"; final String msg = "GameServer " + serverName + ": Connection lost: " + e.getMessage(); - _log.info(msg); + LOGGER.info(msg); } finally { if (isAuthed()) { _gsi.setDown(); - _log.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); + LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); } L2LoginServer.getInstance().getGameServerListener().removeGameServer(this); L2LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); @@ -185,7 +185,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); + LOGGER.finer("GameServerThread: Failed disconnecting banned server, server already disconnected."); } } @@ -209,7 +209,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final ScrambledKeyPair pair = LoginController.getInstance().getScrambledRSAKeyPair(); _privateKey = (RSAPrivateKey) pair.getPrivateKey(); @@ -241,7 +241,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - _log.severe("IOException while sending packet " + sl.getClass().getSimpleName()); + LOGGER.severe("IOException while sending packet " + sl.getClass().getSimpleName()); } } @@ -265,7 +265,7 @@ public class GameServerThread extends Thread */ public void setGameHosts(String[] hosts) { - _log.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); + LOGGER.info("Updated Gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " IP's:"); _gsi.clearServerAddresses(); for (int i = 0; i < hosts.length; i += 2) @@ -276,13 +276,13 @@ public class GameServerThread extends Thread } catch (Exception e) { - _log.warning("Couldn't resolve hostname \"" + e + "\""); + LOGGER.warning("Couldn't resolve hostname \"" + e + "\""); } } for (String s : _gsi.getServerAddresses()) { - _log.info(s); + LOGGER.info(s); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/L2LoginServer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/L2LoginServer.java index bad76dd97c..b87afbb356 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/L2LoginServer.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/L2LoginServer.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.ClientNetworkManager; */ public final class L2LoginServer { - private final Logger _log = Logger.getLogger(L2LoginServer.class.getName()); + private final Logger LOGGER = Logger.getLogger(L2LoginServer.class.getName()); public static final int PROTOCOL_REV = 0x0106; private static L2LoginServer _instance; @@ -77,7 +77,7 @@ public final class L2LoginServer } catch (IOException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } // Load Config @@ -92,7 +92,7 @@ public final class L2LoginServer } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed initializing LoginController. Reason: " + e.getMessage(), e); System.exit(1); } @@ -104,11 +104,11 @@ public final class L2LoginServer { _gameServerListener = new GameServerListener(); _gameServerListener.start(); - _log.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); + LOGGER.info("Listening for GameServers on " + Config.GAME_SERVER_LOGIN_HOST + ":" + Config.GAME_SERVER_LOGIN_PORT); } catch (IOException e) { - _log.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "FATAL: Failed to start the Game Server Listener. Reason: " + e.getMessage(), e); System.exit(1); } @@ -148,7 +148,7 @@ public final class L2LoginServer } catch (NumberFormatException nfe) { - _log.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); return; } } @@ -159,25 +159,25 @@ public final class L2LoginServer } catch (UnknownHostException e) { - _log.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); + LOGGER.warning("Skipped: Invalid address (" + address + ") on (" + bannedFile.getName() + "). Line: " + lnr.getLineNumber()); } }); //@formatter:on } catch (IOException e) { - _log.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error while reading the bans file (" + bannedFile.getName() + "). Details: " + e.getMessage(), e); } - _log.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); + LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); } else { - _log.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); + LOGGER.warning("IP Bans file (" + bannedFile.getName() + ") is missing or is a directory, skipped."); } if (Config.LOGIN_SERVER_SCHEDULE_RESTART) { - _log.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); + LOGGER.info("Scheduled LS restart after " + Config.LOGIN_SERVER_SCHEDULE_RESTART_TIME + " hours"); _restartLoginServer = new LoginServerRestart(); _restartLoginServer.setDaemon(true); _restartLoginServer.start(); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/LoginController.java index ff547092da..a896c7fd7a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/LoginController.java @@ -51,7 +51,7 @@ import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason public class LoginController { - protected static final Logger _log = Logger.getLogger(LoginController.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(LoginController.class.getName()); private static LoginController _instance; @@ -78,7 +78,7 @@ public class LoginController private LoginController() throws GeneralSecurityException { - _log.info("Loading LoginController..."); + LOGGER.info("Loading LoginController..."); _keyPairs = new ScrambledKeyPair[10]; _blowfishKeyGenerator = KeyGenerator.getInstance("Blowfish"); @@ -91,7 +91,7 @@ public class LoginController _keyPairs[i] = new ScrambledKeyPair(rsaKeyPairGenerator.generateKeyPair()); } - _log.info("Cached 10 KeyPairs for RSA communication."); + LOGGER.info("Cached 10 KeyPairs for RSA communication."); final Thread purge = new PurgeThread(); purge.setDaemon(true); @@ -156,7 +156,7 @@ public class LoginController addBanForAddress(addr, Config.LOGIN_BLOCK_AFTER_BAN * 1000); // we need to clear the failed login attempts here, so after the ip ban is over the client has another 5 attempts clearFailedLoginAttemps(addr); - _log.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); + LOGGER.warning("Added banned address " + addr.getHostAddress() + "! Too many login attemps."); } } @@ -218,16 +218,16 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while auto creating account for '" + login + "'!", e); return null; } - _log.info("Auto created account '" + login + "'."); + LOGGER.info("Auto created account '" + login + "'."); return retriveAccountInfo(addr, login, password, false); } catch (Exception e) { - _log.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); + LOGGER.log(Level.WARNING, "Exception while retriving account info for '" + login + "'!", e); return null; } } @@ -301,7 +301,7 @@ public class LoginController if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); - _log.info("Removed expired ip address ban " + address.getHostAddress() + "."); + LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); return false; } return true; @@ -414,7 +414,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set lastServer: " + e.getMessage(), e); } } return loginOk; @@ -433,7 +433,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set accessLevel: " + e.getMessage(), e); } } @@ -452,7 +452,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not set last tracert: " + e.getMessage(), e); } } @@ -532,13 +532,13 @@ public class LoginController { if (!ipWhiteList.isEmpty() && !ipWhiteList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") not present on whitelist for account '" + info.getLogin() + "'."); return false; } if (!ipBlackList.isEmpty() && ipBlackList.contains(address)) { - _log.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); + LOGGER.warning("Account checkin attemp from address(" + address.getHostAddress() + ") on blacklist for account '" + info.getLogin() + "'."); return false; } } @@ -558,7 +558,7 @@ public class LoginController } catch (Exception e) { - _log.log(Level.WARNING, "Could not finish login process!", e); + LOGGER.log(Level.WARNING, "Could not finish login process!", e); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java index 83ad61827b..bfa7e9dc02 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java @@ -38,7 +38,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class L2JGameServerPacketHandler { - protected static Logger _log = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); + protected static Logger LOGGER = Logger.getLogger(L2JGameServerPacketHandler.class.getName()); public enum GameServerState { @@ -65,7 +65,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -83,7 +83,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } @@ -146,7 +146,7 @@ public class L2JGameServerPacketHandler } default: { - _log.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); + LOGGER.warning("Unknown Opcode (" + Integer.toHexString(opcode).toUpperCase() + ") in state " + state.name() + " from GameServer, closing connection."); server.forceClose(LoginServerFail.NOT_AUTHED); break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2LoginClient.java index c4f45ea59b..da20164f21 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -46,7 +46,7 @@ import io.netty.channel.ChannelHandlerContext; */ public final class L2LoginClient extends ChannelInboundHandler { - private static final Logger _log = Logger.getLogger(L2LoginClient.class.getName()); + private static final Logger LOGGER = Logger.getLogger(L2LoginClient.class.getName()); // Crypt private final ScrambledKeyPair _scrambledPair; @@ -105,7 +105,7 @@ public final class L2LoginClient extends ChannelInboundHandler } catch (Exception e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java index 1cd1aceac3..e48d751a7a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java @@ -46,7 +46,7 @@ import com.l2jmobius.loginserver.network.serverpackets.ServerList; */ public class RequestAuthLogin implements IIncomingPacket { - private static Logger _log = Logger.getLogger(RequestAuthLogin.class.getName()); + private static Logger LOGGER = Logger.getLogger(RequestAuthLogin.class.getName()); private final byte[] _raw1 = new byte[128]; private final byte[] _raw2 = new byte[128]; @@ -89,7 +89,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (GeneralSecurityException e) { - _log.log(Level.INFO, "", e); + LOGGER.log(Level.INFO, "", e); return; } @@ -108,7 +108,7 @@ public class RequestAuthLogin implements IIncomingPacket } catch (Exception e) { - _log.log(Level.WARNING, "", e); + LOGGER.log(Level.WARNING, "", e); return; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java index 6abfe18518..a68b2053a7 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java @@ -32,7 +32,7 @@ import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerSt */ public class BlowFishKey extends BaseRecievePacket { - protected static final Logger _log = Logger.getLogger(BlowFishKey.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName()); /** * @param decrypt @@ -67,7 +67,7 @@ public class BlowFishKey extends BaseRecievePacket } catch (GeneralSecurityException e) { - _log.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); + LOGGER.log(Level.SEVERE, "Error While decrypting blowfish key (RSA): " + e.getMessage(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java index 03ff8df8d3..4e0c492ffa 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java @@ -27,7 +27,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class ChangeAccessLevel extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangeAccessLevel.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangeAccessLevel.class.getName()); /** * @param decrypt @@ -40,6 +40,6 @@ public class ChangeAccessLevel extends BaseRecievePacket final String account = readS(); LoginController.getInstance().setAccountAccessLevel(account, level); - _log.info("Changed " + account + " access level to " + level); + LOGGER.info("Changed " + account + " access level to " + level); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java index d4c10be532..69ba99271d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java @@ -35,7 +35,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ChangePassword extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ChangePassword.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ChangePassword.class.getName()); private static GameServerThread gst = null; public ChangePassword(byte[] decrypt) @@ -103,7 +103,7 @@ public class ChangePassword extends BaseRecievePacket passUpdated = ps.executeUpdate(); } - _log.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); + LOGGER.info("The password for account " + accountName + " has been changed from " + curpassEnc + " to " + Base64.getEncoder().encodeToString(password)); if (passUpdated > 0) { gst.ChangePasswordResponse((byte) 1, characterName, "You have successfully changed your password!"); @@ -120,7 +120,7 @@ public class ChangePassword extends BaseRecievePacket } catch (Exception e) { - _log.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); + LOGGER.warning("Error while changing password for account " + accountName + " requested by player " + characterName + "! " + e); } } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java index 2154becbb5..153a4cd86d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java @@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; */ public class GameServerAuth extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(GameServerAuth.class.getName()); + protected static Logger LOGGER = Logger.getLogger(GameServerAuth.class.getName()); GameServerThread _server; private final byte[] _hexId; private final int _desiredId; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java index 194d82d565..baa6528090 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerLogout extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerLogout.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerLogout.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java index 69c263628b..542848f6e6 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java @@ -26,7 +26,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class PlayerTracert extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(PlayerTracert.class.getName()); + protected static Logger LOGGER = Logger.getLogger(PlayerTracert.class.getName()); /** * @param decrypt diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java index 1a76467686..f9a24a80d8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java @@ -31,7 +31,7 @@ import com.l2jmobius.loginserver.LoginController; */ public class RequestTempBan extends BaseRecievePacket { - private static final Logger _log = Logger.getLogger(RequestTempBan.class.getName()); + private static final Logger LOGGER = Logger.getLogger(RequestTempBan.class.getName()); private final String _accountName; @SuppressWarnings("unused") @@ -69,7 +69,7 @@ public class RequestTempBan extends BaseRecievePacket } catch (SQLException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } try diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java index 6c7aed04d5..155d19688d 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java @@ -28,7 +28,7 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class ServerStatus extends BaseRecievePacket { - protected static Logger _log = Logger.getLogger(ServerStatus.class.getName()); + protected static Logger LOGGER = Logger.getLogger(ServerStatus.class.getName()); public static final int SERVER_LIST_STATUS = 0x01; public static final int SERVER_TYPE = 0x02; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java index cc2a6c0c2f..2a71996141 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -61,7 +61,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; */ public final class ServerList implements IOutgoingPacket { - protected static final Logger _log = Logger.getLogger(ServerList.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(ServerList.class.getName()); private final List _servers; private final int _lastServer; @@ -89,7 +89,7 @@ public final class ServerList implements IOutgoingPacket } catch (UnknownHostException e) { - _log.warning(getClass().getSimpleName() + ": " + e.getMessage()); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); _ip = new byte[4]; _ip[0] = 127; _ip[1] = 0; diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java index 593e01a15d..887e4f715c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; */ public class IPv4Filter implements Runnable { - protected final Logger _log = Logger.getLogger(getClass().getName()); + protected final Logger LOGGER = Logger.getLogger(getClass().getName()); private final HashMap _ipFloodMap; private static final long SLEEP_TIME = 5000; @@ -69,7 +69,7 @@ public class IPv4Filter implements Runnable final InetAddress addr = sc.socket().getInetAddress(); if (!(addr instanceof Inet4Address)) { - _log.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); + LOGGER.info("Someone tried to connect from something other than IPv4: " + addr.getHostAddress()); return false; }