From e7ab6986cfade20b0e6cad97cdeedaf96482bbd7 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 9 Dec 2017 21:24:30 +0000 Subject: [PATCH] Removed main server debug config. --- .../dist/game/config/General.ini | 7 -- .../AdminChangeAccessLevel.java | 5 -- .../admincommandhandlers/AdminEditChar.java | 4 -- .../admincommandhandlers/AdminEffects.java | 5 -- .../admincommandhandlers/AdminExpSp.java | 12 ---- .../admincommandhandlers/AdminHeal.java | 4 -- .../admincommandhandlers/AdminInvul.java | 20 ------ .../admincommandhandlers/AdminKill.java | 6 -- .../admincommandhandlers/AdminRes.java | 9 --- .../admincommandhandlers/AdminSkill.java | 9 --- .../admincommandhandlers/AdminTeleport.java | 11 --- .../bypasshandlers/PrivateWarehouse.java | 6 -- .../handlers/chathandlers/ChatGeneral.java | 11 --- .../dist/login/config/LoginServer.ini | 8 --- .../java/com/l2jmobius/Config.java | 6 -- .../data/xml/impl/HitConditionBonusData.java | 12 +--- .../datatables/AugmentationData.java | 8 --- .../gameserver/datatables/ItemTable.java | 5 -- .../instancemanager/CastleManorManager.java | 10 --- .../instancemanager/InstanceManager.java | 4 -- .../gameserver/model/CursedWeapon.java | 5 -- .../l2jmobius/gameserver/model/L2Clan.java | 31 -------- .../actor/instance/L2DefenderInstance.java | 10 --- .../instance/L2FortCommanderInstance.java | 5 -- .../actor/instance/L2FortManagerInstance.java | 20 ------ .../model/actor/instance/L2GuardInstance.java | 9 --- .../model/actor/instance/L2NpcInstance.java | 6 -- .../model/actor/instance/L2PcInstance.java | 18 ----- .../model/actor/status/CharStatus.java | 11 --- .../model/entity/BlockCheckerEngine.java | 6 -- .../model/instancezone/Instance.java | 6 -- .../model/itemcontainer/Inventory.java | 5 -- .../gameserver/model/skills/Skill.java | 4 -- .../gameserver/network/L2GameClient.java | 4 -- .../network/clientpackets/Action.java | 8 +-- .../network/clientpackets/AuthLogin.java | 6 -- .../clientpackets/CannotMoveAnymore.java | 5 -- .../clientpackets/CharacterCreate.java | 40 ----------- .../clientpackets/CharacterDelete.java | 6 -- .../clientpackets/CharacterSelect.java | 6 -- .../network/clientpackets/EnterWorld.java | 11 ++- .../clientpackets/RequestDropItem.java | 18 ----- .../clientpackets/RequestDuelStart.java | 11 --- .../clientpackets/RequestPledgeInfo.java | 5 -- .../network/clientpackets/RequestRestart.java | 5 -- .../network/clientpackets/Say2.java | 5 -- .../network/clientpackets/TradeDone.java | 5 -- .../network/clientpackets/TradeRequest.java | 8 --- .../network/clientpackets/UseItem.java | 4 -- .../l2jmobius/gameserver/util/MinionList.java | 8 --- .../loginserver/GameServerThread.java | 11 --- .../loginserver/LoginController.java | 5 -- .../loginserver/network/L2LoginClient.java | 6 -- .../gameserverpackets/BlowFishKey.java | 5 -- .../gameserverpackets/GameServerAuth.java | 9 --- .../gameserverpackets/PlayerAuthRequest.java | 19 ----- .../gameserverpackets/PlayerInGame.java | 10 --- .../gameserverpackets/PlayerLogout.java | 6 -- .../gameserverpackets/PlayerTracert.java | 5 -- .../network/serverpackets/GGAuth.java | 6 -- .../dist/game/config/General.ini | 7 -- .../AdminChangeAccessLevel.java | 5 -- .../admincommandhandlers/AdminEditChar.java | 4 -- .../admincommandhandlers/AdminEffects.java | 5 -- .../admincommandhandlers/AdminExpSp.java | 12 ---- .../admincommandhandlers/AdminHeal.java | 4 -- .../admincommandhandlers/AdminInvul.java | 20 ------ .../admincommandhandlers/AdminKill.java | 6 -- .../admincommandhandlers/AdminRes.java | 9 --- .../admincommandhandlers/AdminSkill.java | 9 --- .../admincommandhandlers/AdminTeleport.java | 11 --- .../bypasshandlers/PrivateWarehouse.java | 6 -- .../handlers/chathandlers/ChatGeneral.java | 11 --- .../dist/login/config/LoginServer.ini | 8 --- .../java/com/l2jmobius/Config.java | 6 -- .../data/xml/impl/HitConditionBonusData.java | 12 +--- .../datatables/AugmentationData.java | 8 --- .../gameserver/datatables/ItemTable.java | 5 -- .../instancemanager/CastleManorManager.java | 10 --- .../instancemanager/InstanceManager.java | 4 -- .../gameserver/model/CursedWeapon.java | 5 -- .../l2jmobius/gameserver/model/L2Clan.java | 31 -------- .../actor/instance/L2DefenderInstance.java | 10 --- .../instance/L2FortCommanderInstance.java | 5 -- .../actor/instance/L2FortManagerInstance.java | 20 ------ .../model/actor/instance/L2GuardInstance.java | 9 --- .../model/actor/instance/L2NpcInstance.java | 6 -- .../model/actor/instance/L2PcInstance.java | 18 ----- .../model/actor/status/CharStatus.java | 11 --- .../model/entity/BlockCheckerEngine.java | 6 -- .../model/instancezone/Instance.java | 6 -- .../model/itemcontainer/Inventory.java | 5 -- .../gameserver/model/skills/Skill.java | 4 -- .../gameserver/network/L2GameClient.java | 4 -- .../network/clientpackets/Action.java | 8 +-- .../network/clientpackets/AuthLogin.java | 6 -- .../clientpackets/CannotMoveAnymore.java | 5 -- .../clientpackets/CharacterCreate.java | 40 ----------- .../clientpackets/CharacterDelete.java | 6 -- .../clientpackets/CharacterSelect.java | 6 -- .../network/clientpackets/EnterWorld.java | 11 ++- .../clientpackets/RequestDropItem.java | 18 ----- .../clientpackets/RequestDuelStart.java | 11 --- .../clientpackets/RequestPledgeInfo.java | 5 -- .../network/clientpackets/RequestRestart.java | 5 -- .../network/clientpackets/Say2.java | 5 -- .../network/clientpackets/TradeDone.java | 5 -- .../network/clientpackets/TradeRequest.java | 8 --- .../network/clientpackets/UseItem.java | 4 -- .../l2jmobius/gameserver/util/MinionList.java | 8 --- .../loginserver/GameServerThread.java | 11 --- .../loginserver/LoginController.java | 5 -- .../loginserver/network/L2LoginClient.java | 6 -- .../gameserverpackets/BlowFishKey.java | 5 -- .../gameserverpackets/GameServerAuth.java | 9 --- .../gameserverpackets/PlayerAuthRequest.java | 19 ----- .../gameserverpackets/PlayerInGame.java | 10 --- .../gameserverpackets/PlayerLogout.java | 6 -- .../gameserverpackets/PlayerTracert.java | 5 -- .../network/serverpackets/GGAuth.java | 6 -- .../dist/game/config/General.ini | 7 -- .../AdminChangeAccessLevel.java | 5 -- .../admincommandhandlers/AdminEditChar.java | 4 -- .../admincommandhandlers/AdminEffects.java | 5 -- .../admincommandhandlers/AdminExpSp.java | 12 ---- .../admincommandhandlers/AdminHeal.java | 4 -- .../admincommandhandlers/AdminInvul.java | 20 ------ .../admincommandhandlers/AdminKill.java | 6 -- .../admincommandhandlers/AdminRes.java | 9 --- .../admincommandhandlers/AdminSkill.java | 9 --- .../admincommandhandlers/AdminTeleport.java | 11 --- .../bypasshandlers/PrivateWarehouse.java | 6 -- .../handlers/chathandlers/ChatGeneral.java | 11 --- .../dist/login/config/LoginServer.ini | 8 --- .../java/com/l2jmobius/Config.java | 6 -- .../data/xml/impl/HitConditionBonusData.java | 12 +--- .../datatables/AugmentationData.java | 8 --- .../gameserver/datatables/ItemTable.java | 5 -- .../instancemanager/CastleManorManager.java | 10 --- .../instancemanager/InstanceManager.java | 4 -- .../gameserver/model/CursedWeapon.java | 5 -- .../l2jmobius/gameserver/model/L2Clan.java | 31 -------- .../actor/instance/L2DefenderInstance.java | 10 --- .../instance/L2FortCommanderInstance.java | 5 -- .../actor/instance/L2FortManagerInstance.java | 20 ------ .../model/actor/instance/L2GuardInstance.java | 9 --- .../model/actor/instance/L2NpcInstance.java | 6 -- .../model/actor/instance/L2PcInstance.java | 18 ----- .../model/actor/status/CharStatus.java | 11 --- .../model/entity/BlockCheckerEngine.java | 6 -- .../model/instancezone/Instance.java | 6 -- .../model/itemcontainer/Inventory.java | 5 -- .../gameserver/model/skills/Skill.java | 4 -- .../gameserver/network/L2GameClient.java | 4 -- .../network/clientpackets/Action.java | 8 +-- .../network/clientpackets/AuthLogin.java | 6 -- .../clientpackets/CannotMoveAnymore.java | 5 -- .../clientpackets/CharacterCreate.java | 40 ----------- .../clientpackets/CharacterDelete.java | 6 -- .../clientpackets/CharacterSelect.java | 6 -- .../network/clientpackets/EnterWorld.java | 11 ++- .../clientpackets/RequestDropItem.java | 18 ----- .../clientpackets/RequestDuelStart.java | 11 --- .../clientpackets/RequestPledgeInfo.java | 5 -- .../network/clientpackets/RequestRestart.java | 5 -- .../network/clientpackets/Say2.java | 5 -- .../network/clientpackets/TradeDone.java | 5 -- .../network/clientpackets/TradeRequest.java | 8 --- .../network/clientpackets/UseItem.java | 4 -- .../l2jmobius/gameserver/util/MinionList.java | 8 --- .../loginserver/GameServerThread.java | 11 --- .../loginserver/LoginController.java | 5 -- .../loginserver/network/L2LoginClient.java | 6 -- .../gameserverpackets/BlowFishKey.java | 5 -- .../gameserverpackets/GameServerAuth.java | 9 --- .../gameserverpackets/PlayerAuthRequest.java | 19 ----- .../gameserverpackets/PlayerInGame.java | 10 --- .../gameserverpackets/PlayerLogout.java | 6 -- .../gameserverpackets/PlayerTracert.java | 5 -- .../network/serverpackets/GGAuth.java | 6 -- .../dist/game/config/General.ini | 7 -- .../AdminChangeAccessLevel.java | 5 -- .../admincommandhandlers/AdminEditChar.java | 4 -- .../admincommandhandlers/AdminEffects.java | 5 -- .../admincommandhandlers/AdminExpSp.java | 12 ---- .../admincommandhandlers/AdminHeal.java | 4 -- .../admincommandhandlers/AdminInvul.java | 20 ------ .../admincommandhandlers/AdminKill.java | 6 -- .../admincommandhandlers/AdminRes.java | 9 --- .../admincommandhandlers/AdminSkill.java | 9 --- .../admincommandhandlers/AdminTeleport.java | 11 --- .../bypasshandlers/PrivateWarehouse.java | 6 -- .../handlers/chathandlers/ChatGeneral.java | 11 --- .../dist/login/config/LoginServer.ini | 8 --- .../java/com/l2jmobius/Config.java | 6 -- .../data/xml/impl/HitConditionBonusData.java | 12 +--- .../datatables/AugmentationData.java | 8 --- .../gameserver/datatables/ItemTable.java | 5 -- .../instancemanager/CastleManorManager.java | 10 --- .../instancemanager/InstanceManager.java | 4 -- .../gameserver/model/CursedWeapon.java | 5 -- .../l2jmobius/gameserver/model/L2Clan.java | 31 -------- .../actor/instance/L2DefenderInstance.java | 10 --- .../instance/L2FortCommanderInstance.java | 5 -- .../actor/instance/L2FortManagerInstance.java | 20 ------ .../model/actor/instance/L2GuardInstance.java | 9 --- .../model/actor/instance/L2NpcInstance.java | 6 -- .../model/actor/instance/L2PcInstance.java | 18 ----- .../model/actor/status/CharStatus.java | 11 --- .../model/entity/BlockCheckerEngine.java | 6 -- .../model/instancezone/Instance.java | 6 -- .../model/itemcontainer/Inventory.java | 5 -- .../gameserver/model/skills/Skill.java | 4 -- .../gameserver/network/L2GameClient.java | 4 -- .../network/clientpackets/Action.java | 8 +-- .../network/clientpackets/AuthLogin.java | 6 -- .../clientpackets/CannotMoveAnymore.java | 5 -- .../clientpackets/CharacterCreate.java | 40 ----------- .../clientpackets/CharacterDelete.java | 6 -- .../clientpackets/CharacterSelect.java | 6 -- .../network/clientpackets/EnterWorld.java | 11 ++- .../clientpackets/RequestDropItem.java | 18 ----- .../clientpackets/RequestDuelStart.java | 11 --- .../clientpackets/RequestPledgeInfo.java | 5 -- .../network/clientpackets/RequestRestart.java | 5 -- .../network/clientpackets/Say2.java | 5 -- .../network/clientpackets/TradeDone.java | 5 -- .../network/clientpackets/TradeRequest.java | 8 --- .../network/clientpackets/UseItem.java | 4 -- .../l2jmobius/gameserver/util/MinionList.java | 8 --- .../loginserver/GameServerThread.java | 11 --- .../loginserver/LoginController.java | 5 -- .../loginserver/network/L2LoginClient.java | 6 -- .../gameserverpackets/BlowFishKey.java | 5 -- .../gameserverpackets/GameServerAuth.java | 9 --- .../gameserverpackets/PlayerAuthRequest.java | 19 ----- .../gameserverpackets/PlayerInGame.java | 10 --- .../gameserverpackets/PlayerLogout.java | 6 -- .../gameserverpackets/PlayerTracert.java | 5 -- .../network/serverpackets/GGAuth.java | 6 -- .../dist/game/config/General.ini | 7 -- .../AdminChangeAccessLevel.java | 5 -- .../admincommandhandlers/AdminEditChar.java | 8 --- .../admincommandhandlers/AdminEffects.java | 5 -- .../admincommandhandlers/AdminExpSp.java | 12 ---- .../admincommandhandlers/AdminHeal.java | 4 -- .../admincommandhandlers/AdminInvul.java | 12 ---- .../admincommandhandlers/AdminKill.java | 6 -- .../admincommandhandlers/AdminRes.java | 9 --- .../admincommandhandlers/AdminSkill.java | 9 --- .../admincommandhandlers/AdminTeleport.java | 10 --- .../bypasshandlers/ClanWarehouse.java | 11 --- .../bypasshandlers/PrivateWarehouse.java | 5 -- .../handlers/chathandlers/ChatGeneral.java | 11 --- .../telnethandlers/PlayerHandler.java | 9 --- .../scripts/instances/AbstractInstance.java | 11 --- .../dist/login/config/LoginServer.ini | 8 --- .../java/com/l2jmobius/Config.java | 6 -- .../gameserver/ai/L2FortSiegeGuardAI.java | 11 --- .../gameserver/ai/L2SiegeGuardAI.java | 11 --- .../gameserver/data/sql/impl/ClanTable.java | 5 -- .../data/xml/impl/HitConditionBonusData.java | 12 +--- .../datatables/AugmentationData.java | 8 --- .../gameserver/datatables/ItemTable.java | 5 -- .../gameserver/datatables/SkillData.java | 6 -- .../instancemanager/CastleManorManager.java | 10 --- .../instancemanager/games/Lottery.java | 41 ----------- .../gameserver/model/CursedWeapon.java | 5 -- .../l2jmobius/gameserver/model/L2Clan.java | 27 ------- .../gameserver/model/L2GroupSpawn.java | 5 -- .../l2jmobius/gameserver/model/L2Spawn.java | 4 -- .../l2jmobius/gameserver/model/L2World.java | 5 -- .../actor/instance/L2AuctioneerInstance.java | 27 +------ .../instance/L2ClanHallManagerInstance.java | 72 +++++-------------- .../model/actor/instance/L2CubicInstance.java | 44 ------------ .../actor/instance/L2DefenderInstance.java | 10 --- .../instance/L2FortCommanderInstance.java | 5 -- .../actor/instance/L2FortManagerInstance.java | 48 +++---------- .../model/actor/instance/L2GuardInstance.java | 10 --- .../model/actor/instance/L2NpcInstance.java | 6 -- .../model/actor/instance/L2PcInstance.java | 18 ----- .../instance/L2SepulcherNpcInstance.java | 6 -- .../actor/instance/L2TeleporterInstance.java | 5 -- .../model/actor/knownlist/GuardKnownList.java | 14 ---- .../model/actor/status/CharStatus.java | 16 ----- .../model/actor/tasks/cubics/CubicAction.java | 35 --------- .../model/entity/BlockCheckerEngine.java | 6 -- .../model/itemcontainer/Inventory.java | 5 -- .../gameserver/model/skills/Skill.java | 4 -- .../gameserver/model/stats/Formulas.java | 8 --- .../network/clientpackets/Action.java | 8 +-- .../network/clientpackets/AuthLogin.java | 6 -- .../clientpackets/CannotMoveAnymore.java | 5 -- .../clientpackets/CharacterCreate.java | 40 ----------- .../clientpackets/CharacterDelete.java | 6 -- .../clientpackets/CharacterSelect.java | 6 -- .../network/clientpackets/EnterWorld.java | 11 ++- .../clientpackets/L2GameClientPacket.java | 5 -- .../network/clientpackets/Logout.java | 9 --- .../network/clientpackets/NewCharacter.java | 6 -- .../clientpackets/ProtocolVersion.java | 9 --- .../clientpackets/RequestActionUse.java | 13 ---- .../clientpackets/RequestAutoSoulShot.java | 6 -- .../clientpackets/RequestDropItem.java | 18 ----- .../clientpackets/RequestDuelStart.java | 11 --- .../clientpackets/RequestExEnchantSkill.java | 5 -- .../RequestExEnchantSkillRouteChange.java | 5 -- .../RequestExEnchantSkillSafe.java | 5 -- .../RequestExEnchantSkillUntrain.java | 5 -- .../clientpackets/RequestExRqItemLink.java | 8 --- .../clientpackets/RequestJoinParty.java | 23 ------ .../clientpackets/RequestMakeMacro.java | 6 -- .../clientpackets/RequestPledgeInfo.java | 12 ---- .../clientpackets/RequestQuestAbort.java | 15 ---- .../clientpackets/RequestRecipeBookOpen.java | 5 -- .../network/clientpackets/RequestRestart.java | 5 -- .../clientpackets/RequestUnEquipItem.java | 6 -- .../network/clientpackets/Say2.java | 5 -- .../network/clientpackets/TradeDone.java | 5 -- .../network/clientpackets/TradeRequest.java | 8 --- .../network/clientpackets/UseItem.java | 9 --- .../network/serverpackets/SSQStatus.java | 24 ------- .../l2jmobius/gameserver/util/MinionList.java | 8 --- .../loginserver/GameServerThread.java | 11 --- .../loginserver/LoginController.java | 5 -- .../loginserver/network/L2LoginClient.java | 6 -- .../gameserverpackets/BlowFishKey.java | 5 -- .../gameserverpackets/GameServerAuth.java | 9 --- .../gameserverpackets/PlayerAuthRequest.java | 19 ----- .../gameserverpackets/PlayerInGame.java | 10 --- .../gameserverpackets/PlayerLogout.java | 6 -- .../gameserverpackets/PlayerTracert.java | 5 -- .../network/serverpackets/GGAuth.java | 6 -- .../dist/game/config/General.ini | 7 -- .../AdminChangeAccessLevel.java | 5 -- .../admincommandhandlers/AdminEditChar.java | 4 -- .../admincommandhandlers/AdminEffects.java | 5 -- .../admincommandhandlers/AdminExpSp.java | 12 ---- .../admincommandhandlers/AdminHeal.java | 4 -- .../admincommandhandlers/AdminInvul.java | 20 ------ .../admincommandhandlers/AdminKill.java | 6 -- .../admincommandhandlers/AdminRes.java | 9 --- .../admincommandhandlers/AdminSkill.java | 9 --- .../admincommandhandlers/AdminTeleport.java | 11 --- .../bypasshandlers/PrivateWarehouse.java | 6 -- .../handlers/chathandlers/ChatGeneral.java | 11 --- .../dist/login/config/LoginServer.ini | 8 --- .../java/com/l2jmobius/Config.java | 6 -- .../data/xml/impl/HitConditionBonusData.java | 12 +--- .../datatables/AugmentationData.java | 8 --- .../gameserver/datatables/ItemTable.java | 5 -- .../instancemanager/CastleManorManager.java | 10 --- .../instancemanager/InstanceManager.java | 4 -- .../gameserver/model/CursedWeapon.java | 5 -- .../l2jmobius/gameserver/model/L2Clan.java | 31 -------- .../actor/instance/L2DefenderInstance.java | 10 --- .../instance/L2FortCommanderInstance.java | 5 -- .../actor/instance/L2FortManagerInstance.java | 20 ------ .../model/actor/instance/L2GuardInstance.java | 9 --- .../model/actor/instance/L2NpcInstance.java | 6 -- .../model/actor/instance/L2PcInstance.java | 18 ----- .../model/actor/status/CharStatus.java | 11 --- .../model/entity/BlockCheckerEngine.java | 6 -- .../model/instancezone/Instance.java | 6 -- .../model/itemcontainer/Inventory.java | 5 -- .../gameserver/model/skills/Skill.java | 4 -- .../gameserver/network/L2GameClient.java | 4 -- .../network/clientpackets/Action.java | 8 +-- .../network/clientpackets/AuthLogin.java | 6 -- .../clientpackets/CannotMoveAnymore.java | 5 -- .../clientpackets/CharacterCreate.java | 40 ----------- .../clientpackets/CharacterDelete.java | 6 -- .../clientpackets/CharacterSelect.java | 6 -- .../network/clientpackets/EnterWorld.java | 11 ++- .../clientpackets/RequestDropItem.java | 18 ----- .../clientpackets/RequestDuelStart.java | 11 --- .../clientpackets/RequestPledgeInfo.java | 5 -- .../network/clientpackets/RequestRestart.java | 5 -- .../network/clientpackets/Say2.java | 5 -- .../network/clientpackets/TradeDone.java | 5 -- .../network/clientpackets/TradeRequest.java | 8 --- .../network/clientpackets/UseItem.java | 4 -- .../l2jmobius/gameserver/util/MinionList.java | 8 --- .../loginserver/GameServerThread.java | 11 --- .../loginserver/LoginController.java | 5 -- .../loginserver/network/L2LoginClient.java | 6 -- .../gameserverpackets/BlowFishKey.java | 5 -- .../gameserverpackets/GameServerAuth.java | 9 --- .../gameserverpackets/PlayerAuthRequest.java | 19 ----- .../gameserverpackets/PlayerInGame.java | 10 --- .../gameserverpackets/PlayerLogout.java | 6 -- .../gameserverpackets/PlayerTracert.java | 5 -- .../network/serverpackets/GGAuth.java | 6 -- 393 files changed, 77 insertions(+), 3640 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini index 7ec52515ce..bc5d0931e0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini @@ -684,13 +684,6 @@ AllowReportsFromSameClanMembers = False # Do not touch these if you do not know what you are doing. # These settings are for debugging servers ONLY. They are not meant for LIVE servers. -# Default: False -Debug = False - -# Instances debugging -# Default: False -InstanceDebug = False - # Html action cache debugging # Default: False HtmlActionCacheDebug = False diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index add0fc00ce..d34b4302c7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -20,7 +20,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.data.xml.impl.AdminData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -93,10 +92,6 @@ public final class AdminChangeAccessLevel implements IAdminCommandHandler catch (SQLException se) { activeChar.sendMessage("SQLException while changing character's access level"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } } 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 d12bce2242..534eb332f0 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 @@ -1197,10 +1197,6 @@ public class AdminEditChar implements IAdminCommandHandler sm.addInt(newReputation); player.sendPacket(sm); activeChar.sendMessage("Successfully Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ")."); - if (Config.DEBUG) - { - _log.finer("[SET KARMA] [GM]" + activeChar.getName() + " Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ")."); - } } private void editCharacter(L2PcInstance activeChar, String targetName) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index b6012bde39..33823c066e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.Arrays; import java.util.StringTokenizer; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.enums.Team; @@ -513,10 +512,6 @@ public class AdminEffects implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } } } else if (command.startsWith("admin_ave_abnormal")) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java index fdee3ec383..6f9c555c6f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java @@ -17,9 +17,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminExpSp implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminExpSp.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_add_exp_sp_to_character", @@ -150,10 +146,6 @@ public class AdminExpSp implements IAdminCommandHandler player.addExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + "."); - } } return true; } @@ -197,10 +189,6 @@ public class AdminExpSp implements IAdminCommandHandler player.removeExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + "."); - } } return true; } 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 67a0476e48..5acf20c5b6 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 @@ -122,10 +122,6 @@ public class AdminHeal implements IAdminCommandHandler { target.setCurrentCp(target.getMaxCp()); } - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") healed character " + target.getName()); - } } else { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index e0b48d8b99..1fff955404 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminInvul implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminInvul.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_invul", @@ -86,19 +82,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setIsInvul(false); text = activeChar.getName() + " is now mortal."; - if (Config.DEBUG) - { - _log.finer("GM: Gm removed invul mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setIsInvul(true); text = activeChar.getName() + " is now invulnerable."; - if (Config.DEBUG) - { - _log.finer("GM: Gm activated invul mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } @@ -110,19 +98,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setUndying(false); text = activeChar.getName() + " is now mortal."; - if (Config.DEBUG) - { - _log.finer("GM: Gm removed undying mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setUndying(true); text = activeChar.getName() + " is now undying."; - if (Config.DEBUG) - { - _log.finer("GM: Gm activated undying mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 1519831ed1..4a5209e59f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -17,7 +17,6 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -36,7 +35,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminKill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminKill.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_kill", @@ -154,10 +152,6 @@ public class AdminKill implements IAdminCommandHandler target.setIsInvul(true); } } - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") killed character " + target.getObjectId()); - } } @Override diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java index 4db018597d..5f2dffa9d6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; @@ -34,7 +31,6 @@ import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; */ public class AdminRes implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_res", @@ -123,11 +119,6 @@ public class AdminRes implements IAdminCommandHandler } doResurrect((L2Character) obj); - - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") resurrected character " + obj.getObjectId()); - } } private void handleNonPlayerRes(L2PcInstance activeChar) 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 8a51638dd2..ea51fdd106 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 @@ -21,7 +21,6 @@ import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; @@ -538,10 +537,6 @@ public class AdminSkill implements IAdminCommandHandler player.sendSkillList(); // Admin info. activeChar.sendMessage("You gave the skill " + name + " to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("[GM]" + activeChar.getName() + " gave skill " + name + " to " + player.getName() + "."); - } activeChar.sendSkillList(); } else @@ -573,10 +568,6 @@ public class AdminSkill implements IAdminCommandHandler player.removeSkill(skill); // Admin information activeChar.sendMessage("You removed the skill " + skillname + " from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("[GM]" + activeChar.getName() + " removed skill " + skillname + " from " + player.getName() + "."); - } activeChar.sendSkillList(); } else 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 7eda72c449..3f807d137a 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 @@ -23,7 +23,6 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.NpcData; @@ -135,10 +134,6 @@ public class AdminTeleport implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - _log.info("admin_walk: " + e); - } } } else if (command.startsWith("admin_move_to")) @@ -564,12 +559,6 @@ public class AdminTeleport implements IAdminCommandHandler spawn.init(); activeChar.sendMessage("Created " + template1.getName() + " on " + target.getObjectId() + "."); - - if (Config.DEBUG) - { - _log.finer("Spawn at X=" + spawn.getX() + " Y=" + spawn.getY() + " Z=" + spawn.getZ()); - _log.warning("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") moved NPC " + target.getObjectId()); - } } catch (Exception e) { 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 740b004b22..d6c31d5495 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 @@ -18,7 +18,6 @@ package handlers.bypasshandlers; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -85,11 +84,6 @@ public class PrivateWarehouse implements IBypassHandler } player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE)); - - if (Config.DEBUG) - { - _log.finer("Source: L2WarehouseInstance.java; Player: " + player.getName() + "; Command: showRetrieveWindow; Message: Showing stored items."); - } } @Override diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 0334844fe8..d195c3e64a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -17,7 +17,6 @@ package handlers.chathandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.ChatType; @@ -38,8 +37,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class ChatGeneral implements IChatHandler { - private static Logger _log = Logger.getLogger(ChatGeneral.class.getName()); - private static final ChatType[] CHAT_TYPES = { ChatType.GENERAL, @@ -63,10 +60,6 @@ public final class ChatGeneral implements IChatHandler else { command = text.substring(1); - if (Config.DEBUG) - { - _log.info("Command: " + command); - } } vch = VoicedCommandHandler.getInstance().getHandler(command); if (vch != null) @@ -76,10 +69,6 @@ public final class ChatGeneral implements IChatHandler } else { - if (Config.DEBUG) - { - _log.warning("No handler registered for bypass '" + command + "'"); - } vcd_used = false; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini b/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini index 04bb765318..fe9cc1f9de 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/login/config/LoginServer.ini @@ -125,11 +125,3 @@ LoginRestartSchedule = False # Time in hours. # Default: 24 LoginRestartTime = 24 - - -# --------------------------------------------------------------------------- -# Developer Settings -# --------------------------------------------------------------------------- - -# Default: False -Debug = False diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java index 38cb9f3742..e09d18a6b6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java @@ -419,8 +419,6 @@ public final class Config public static boolean SKILL_CHECK_ENABLE; public static boolean SKILL_CHECK_REMOVE; public static boolean SKILL_CHECK_GM; - public static boolean DEBUG; - public static boolean DEBUG_INSTANCES; public static boolean HTML_ACTION_CACHE_DEBUG; public static boolean PACKET_HANDLER_DEBUG; public static boolean DEVELOPER; @@ -1823,8 +1821,6 @@ public final class Config SKILL_CHECK_ENABLE = General.getBoolean("SkillCheckEnable", false); SKILL_CHECK_REMOVE = General.getBoolean("SkillCheckRemove", false); SKILL_CHECK_GM = General.getBoolean("SkillCheckGM", true); - DEBUG = General.getBoolean("Debug", false); - DEBUG_INSTANCES = General.getBoolean("InstanceDebug", false); HTML_ACTION_CACHE_DEBUG = General.getBoolean("HtmlActionCacheDebug", false); PACKET_HANDLER_DEBUG = General.getBoolean("PacketHandlerDebug", false); DEVELOPER = General.getBoolean("Developer", false); @@ -2883,8 +2879,6 @@ public final class Config DATAPACK_ROOT = new File("."); } - DEBUG = ServerSettings.getBoolean("Debug", false); - ACCEPT_NEW_GAMESERVER = ServerSettings.getBoolean("AcceptNewGameServer", true); LOGIN_TRY_BEFORE_BAN = ServerSettings.getInt("LoginTryBeforeBan", 5); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java index fc1fd57c3e..ee076bff4b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java @@ -23,7 +23,6 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.IGameXmlReader; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -42,6 +41,7 @@ public final class HitConditionBonusData implements IGameXmlReader private int highBonus = 0; private int lowBonus = 0; private int darkBonus = 0; + @SuppressWarnings("unused") private int rainBonus = 0; /** @@ -57,16 +57,6 @@ public final class HitConditionBonusData implements IGameXmlReader { parseDatapackFile("data/stats/hitConditionBonus.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded Hit Condition bonuses."); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Front bonus: " + frontBonus); - LOGGER.info(getClass().getSimpleName() + ": Side bonus: " + sideBonus); - LOGGER.info(getClass().getSimpleName() + ": Back bonus: " + backBonus); - LOGGER.info(getClass().getSimpleName() + ": High bonus: " + highBonus); - LOGGER.info(getClass().getSimpleName() + ": Low bonus: " + lowBonus); - LOGGER.info(getClass().getSimpleName() + ": Dark bonus: " + darkBonus); - LOGGER.info(getClass().getSimpleName() + ": Rain bonus: " + rainBonus); - } } @Override diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/AugmentationData.java index 8582c38326..23b5e67b43 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/AugmentationData.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/AugmentationData.java @@ -914,10 +914,6 @@ public class AugmentationData } stat12 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; resultColor=" + resultColor + "; level=" + lifeStoneLevel + "; grade=" + lifeStoneGrade); - } return new Augmentation(((stat34 << 16) + stat12)); } @@ -1047,10 +1043,6 @@ public class AugmentationData // stat12 has stats only stat12 = base + skillsLength + (ACC_STAT_SUBBLOCKSIZE * resultColor) + stat12; - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Accessory augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; level=" + lifeStoneLevel); - } final int augmentationId = ((stat34 << 16) + stat12); return getAugmentation(augmentationId); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/ItemTable.java index 8e700cdd85..4f74f2b04c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/ItemTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/ItemTable.java @@ -234,11 +234,6 @@ public class ItemTable } } - if (Config.DEBUG) - { - LOGGER.finer(getClass().getSimpleName() + ": Item created: " + item); - } - // Add the L2ItemInstance object to _allObjects of L2world L2World.getInstance().storeObject(item); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 0b8070e37b..d2b606a72a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -108,12 +108,6 @@ public final class CastleManorManager implements IGameXmlReader, IStorable { ThreadPoolManager.scheduleAtFixedRate(this::storeMe, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000); } - - // Send debug message - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode); - } } else { @@ -435,10 +429,6 @@ public final class CastleManorManager implements IGameXmlReader, IStorable } } scheduleModeChange(); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Manor mode changed to " + _mode + "!"); - } } public final void setNextSeedProduction(List list, int castleId) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index c776c03a97..3149d5ff45 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -448,10 +448,6 @@ public final class InstanceManager implements IGameXmlReader { if (_currentInstanceId == Integer.MAX_VALUE) { - if (Config.DEBUG_INSTANCES) - { - LOGGER.info(getClass().getSimpleName() + ": Instance id owerflow, starting from zero."); - } _currentInstanceId = 0; } _currentInstanceId++; 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 0f821abc37..86a1a80e9b 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 @@ -472,11 +472,6 @@ public class CursedWeapon implements INamable public void saveData() { - if (Config.DEBUG) - { - _log.info("CursedWeapon: Saving data to disk."); - } - try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM cursed_weapons WHERE itemId = ?"); PreparedStatement ps = con.prepareStatement("INSERT INTO cursed_weapons (itemId, charId, playerReputation, playerPkKills, nbKills, endTime) VALUES (?, ?, ?, ?, ?, ?)")) 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 595b5f41ef..5ae4e47d9f 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 @@ -987,10 +987,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(9, getNewLeaderId()); ps.setInt(10, getId()); ps.execute(); - if (Config.DEBUG) - { - _log.finer("New clan leader saved in db: " + getId()); - } } catch (Exception e) { @@ -1032,10 +1028,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(12, getAllyCrestId()); ps.setInt(13, getNewLeaderId()); ps.execute(); - if (Config.DEBUG) - { - _log.finer("New clan saved in db: " + getId()); - } } catch (Exception e) { @@ -1060,10 +1052,6 @@ public class L2Clan implements IIdentifiable, INamable ps1.setLong(3, clanCreateExpiryTime); ps1.setInt(4, member.getObjectId()); ps1.execute(); - if (Config.DEBUG) - { - _log.finer("clan member removed in db: " + getId()); - } // Remove apprentice. ps2.setInt(1, member.getObjectId()); ps2.execute(); @@ -1141,11 +1129,6 @@ public class L2Clan implements IIdentifiable, INamable } } - if (Config.DEBUG && (getName() != null)) - { - _log.info("Restored clan data for \"" + getName() + "\" from database."); - } - restoreSubPledges(); restoreRankPrivs(); restoreSkills(); @@ -1909,11 +1892,6 @@ public class L2Clan implements IIdentifiable, INamable // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } - - if (Config.DEBUG) - { - _log.finer("New sub_clan saved in db: " + getId() + "; " + pledgeType); - } } catch (Exception e) { @@ -1979,10 +1957,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(3, getId()); ps.setInt(4, pledgeType); ps.execute(); - if (Config.DEBUG) - { - _log.finer("Subpledge updated in db: " + getId()); - } } catch (Exception e) { @@ -2427,11 +2401,6 @@ public class L2Clan implements IIdentifiable, INamable return; } - if (Config.DEBUG) - { - _log.finer(player.getObjectId() + "(" + player.getName() + ") requested ally creation from "); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); 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 55ebf4f5c1..f9aa07f44d 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 @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -104,10 +103,6 @@ public class L2DefenderInstance extends L2Attackable } if (!isInsideRadius(getSpawn(), 40, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); @@ -147,11 +142,6 @@ public class L2DefenderInstance extends L2Attackable // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - _log.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java index 4f7386ef47..b982a00c9f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; @@ -99,10 +98,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance { if (!isInsideRadius(getSpawn(), 200, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java index fc636123fb..a7ec0202ed 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -442,10 +442,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -493,10 +489,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -544,10 +536,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Exp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -719,10 +707,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Tele editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -770,10 +754,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Support editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 6a94be63b5..214c883f17 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; */ public class L2GuardInstance extends L2Attackable { - private static Logger _log = Logger.getLogger(L2GuardInstance.class.getName()); - /** * Constructor of L2GuardInstance (use L2Character and L2NpcInstance constructor).
* Actions : @@ -172,11 +168,6 @@ public class L2GuardInstance extends L2Attackable // Check if the L2PcInstance is in the _aggroList of the L2GuardInstance if (containsTarget(player)) { - if (Config.DEBUG) - { - _log.finer(player.getObjectId() + ": Attacked guard " + getObjectId()); - } - // Set the L2PcInstance Intention to AI_INTENTION_ATTACK player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index 11f2e21933..ed9aab530f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; import java.util.Map; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.model.L2SkillLearn; @@ -61,11 +60,6 @@ public class L2NpcInstance extends L2Npc */ public static void showSkillList(L2PcInstance player, L2Npc npc, ClassId classId) { - if (Config.DEBUG) - { - _log.finer("SkillList activated on: " + npc.getObjectId()); - } - final int npcId = npc.getTemplate().getId(); if (npcId == 32611) // Tolonis (Officer) { 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 85accd252a..7163ac783b 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 @@ -3885,20 +3885,11 @@ public final class L2PcInstance extends L2Playable final L2Summon pet = getPet(); if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return null; } if (isProcessingItem(objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return null; } @@ -10570,20 +10561,11 @@ public final class L2PcInstance extends L2Playable final L2Summon pet = getPet(); if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return false; } if (isProcessingItem(objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return false; } 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 9494559d7d..9af40f494e 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 @@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -207,11 +206,6 @@ public class CharStatus { if ((_regTask == null) && !getActiveChar().isDead()) { - if (Config.DEBUG) - { - _log.finer("HP/MP regen started"); - } - // Get the Regeneration period final int period = Formulas.getRegeneratePeriod(getActiveChar()); @@ -232,11 +226,6 @@ public class CharStatus { if (_regTask != null) { - if (Config.DEBUG) - { - _log.finer("HP/MP regen stop"); - } - // Stop the HP/MP/CP Regeneration task _regTask.cancel(false); _regTask = null; 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 d38ef03cf0..fc216cf183 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 @@ -24,7 +24,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.NpcData; @@ -307,11 +306,6 @@ public final class BlockCheckerEngine _abnormalEnd = true; ThreadPoolManager.execute(new EndEvent()); - - if (Config.DEBUG) - { - _log.info("Handys Block Checker Event at arena " + _arena + " ended due lack of players!"); - } } } catch (Exception e) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index 232944b028..77c2468437 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -128,12 +128,6 @@ public final class Instance implements IIdentifiable, INamable // Notify DP scripts EventDispatcher.getInstance().notifyEventAsync(new OnInstanceCreated(this, player), _template); } - - // Debug logger - if (Config.DEBUG_INSTANCES) - { - LOGGER.info("Instance " + _template.getName() + " (" + _template.getId() + ") has been created with instance id " + getId()); - } } @Override diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index f68c70c87a..cb1c796bc5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1297,11 +1297,6 @@ public abstract class Inventory extends ItemContainer */ public L2ItemInstance unEquipItemInBodySlot(int slot) { - if (Config.DEBUG) - { - LOGGER.info("Unequip body slot: " + slot); - } - int pdollSlot = -1; switch (slot) 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 8c4ba4eb64..8e4641502a 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 @@ -264,10 +264,6 @@ public final class Skill implements IIdentifiable if (Config.ENABLE_MODIFY_SKILL_REUSE && Config.SKILL_REUSE_LIST.containsKey(_id)) { - if (Config.DEBUG) - { - _log.info("*** Skill " + _name + " (" + _level + ") changed reuse from " + set.getInt("reuseDelay", 0) + " to " + Config.SKILL_REUSE_LIST.get(_id) + " seconds."); - } _reuseDelay = Config.SKILL_REUSE_LIST.get(_id); } else 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 f0fc7726d3..65ee4bbc41 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 @@ -170,10 +170,6 @@ public final class L2GameClient extends ChannelInboundHandler @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - if (Config.DEBUG) - { - LOGGER.log(Level.WARNING, "Network exception caught for: " + toString(), cause); - } } public Channel getChannel() 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 ccd2d1d13a..f92d2c5e23 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 @@ -32,8 +32,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; public final class Action implements IClientIncomingPacket { private int _objectId; + @SuppressWarnings("unused") private int _originX; + @SuppressWarnings("unused") private int _originY; + @SuppressWarnings("unused") private int _originZ; private int _actionId; @@ -51,11 +54,6 @@ public final class Action implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (Config.DEBUG) - { - _log.info(getClass().getSimpleName() + ": " + (_actionId == 0 ? "Simple-click" : "Shift-click") + " Target object ID: " + _objectId + " orignX: " + _originX + " orignY: " + _originY + " orignZ: " + _originZ); - } - // Get the current L2PcInstance of the player final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 8890047012..22dfca0017 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.LoginServerThread; import com.l2jmobius.gameserver.LoginServerThread.SessionKey; @@ -60,11 +59,6 @@ public final class AuthLogin implements IClientIncomingPacket } final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2); - if (Config.DEBUG) - { - _log.info("user:" + _loginName); - _log.info("key:" + key); - } // avoid potential exploits if (client.getAccountName() == null) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 7f9cb857c7..f202f197b2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.model.Location; @@ -53,10 +52,6 @@ public final class CannotMoveAnymore implements IClientIncomingPacket return; } - if (Config.DEBUG) - { - _log.finer("client: x:" + _x + " y:" + _y + " z:" + _z + " server x:" + player.getX() + " y:" + player.getY() + " z:" + player.getZ()); - } if (player.getAI() != null) { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); 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 06464d9911..f530aead0c 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 @@ -92,11 +92,6 @@ public final class CharacterCreate implements IClientIncomingPacket // Last Verified: May 30, 2009 - Gracia Final - Players are able to create characters with names consisting of as little as 1,2,3 letter/number combinations. if ((_name.length() < 1) || (_name.length() > 16)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Your title cannot exceed 16 characters in length. Please try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS)); return; } @@ -122,11 +117,6 @@ public final class CharacterCreate implements IClientIncomingPacket // Last Verified: May 30, 2009 - Gracia Final if (!Util.isAlphaNumeric(_name) || !isValidName(_name)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Incorrect name. Please try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_INCORRECT_NAME)); return; } @@ -165,21 +155,11 @@ public final class CharacterCreate implements IClientIncomingPacket { if ((CharNameTable.getInstance().getAccountCharacterCount(client.getAccountName()) >= Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT) && (Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT != 0)) { - if (Config.DEBUG) - { - _log.finer("Max number of characters reached. Creation failed."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_TOO_MANY_CHARACTERS)); return; } else if (CharNameTable.getInstance().doesCharNameExist(_name)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Message generated: You cannot create another character. Please delete the existing character and try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS)); return; } @@ -187,11 +167,6 @@ public final class CharacterCreate implements IClientIncomingPacket template = PlayerTemplateData.getInstance().getTemplate(_classId); if ((template == null) || (ClassId.getClassId(_classId).level() > 0)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: " + _name + " classId: " + _classId + " Template: " + template + " Message generated: Your character creation has failed."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -286,11 +261,6 @@ public final class CharacterCreate implements IClientIncomingPacket private void initNewChar(L2GameClient client, L2PcInstance newChar) { - if (Config.DEBUG) - { - _log.finer("Character init start"); - } - L2World.getInstance().storeObject(newChar); if (Config.STARTING_ADENA > 0) @@ -350,11 +320,6 @@ public final class CharacterCreate implements IClientIncomingPacket for (L2SkillLearn skill : SkillTreesData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true)) { - if (Config.DEBUG) - { - _log.finer("Adding starter skill:" + skill.getSkillId() + " / " + skill.getSkillLevel()); - } - newChar.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true); } @@ -372,10 +337,5 @@ public final class CharacterCreate implements IClientIncomingPacket final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.setCharSelection(cl.getCharInfo()); - - if (Config.DEBUG) - { - _log.finer("Character init end"); - } } } 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 bf1369b884..cd62eefdba 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 @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.enums.CharacterDeleteFailType; import com.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -55,11 +54,6 @@ public final class CharacterDelete implements IClientIncomingPacket // return; // } - if (Config.DEBUG) - { - _log.finer("deleting slot:" + _charSlot); - } - try { final CharacterDeleteFailType failType = client.markToDeleteChar(_charSlot); 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 9a3530ea8c..579b270fb4 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 @@ -145,12 +145,6 @@ public class CharacterSelect implements IClientIncomingPacket } } - // The L2PcInstance must be created here, so that it can be attached to the L2GameClient - if (Config.DEBUG) - { - _log.finer("selected slot:" + _charSlot); - } - // load up character from disk final L2PcInstance cha = client.loadCharFromDisk(_charSlot); if (cha == null) 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 952f296f64..7157284859 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 @@ -165,13 +165,10 @@ public class EnterWorld implements IClientIncomingPacket vars.remove("INSTANCE_RESTORE"); } - if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) - { - if (Config.DEBUG) - { - _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); - } - } + // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) + // { + // _log.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/RequestDropItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index f11a357d3e..04b62b31bf 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 @@ -149,20 +149,12 @@ public final class RequestDropItem implements IClientIncomingPacket if ((L2Item.TYPE2_QUEST == item.getItem().getType2()) && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ":player tried to drop quest item"); - } activeChar.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED_OR_EXCHANGED); return; } if (!activeChar.isInsideRadius(_x, _y, 0, 150, false, false) || (Math.abs(_z - activeChar.getZ()) > 50)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ": trying to drop too far away"); - } activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DISCARD_SOMETHING_THAT_FAR_AWAY_FROM_YOU); return; } @@ -173,11 +165,6 @@ public final class RequestDropItem implements IClientIncomingPacket return; } - if (Config.DEBUG) - { - _log.finer("requested drop item " + _objectId + "(" + item.getCount() + ") at " + _x + "/" + _y + "/" + _z); - } - if (item.isEquipped()) { activeChar.getInventory().unEquipItemInSlot(item.getLocationSlot()); @@ -187,11 +174,6 @@ public final class RequestDropItem implements IClientIncomingPacket final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); - if (Config.DEBUG) - { - _log.finer("dropping " + _objectId + " item(" + _count + ") at: " + _x + " " + _y + " " + _z); - } - // activeChar.broadcastUserInfo(); if (activeChar.isGM()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java index ee8bcd656b..c1d19b5e5b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData; @@ -193,11 +192,6 @@ public final class RequestDuelStart implements IClientIncomingPacket activeChar.onTransactionRequest(partyLeader); partyLeader.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.finer(activeChar.getName() + " requested a duel with " + partyLeader.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(partyLeader.getName()); activeChar.sendPacket(msg); @@ -222,11 +216,6 @@ public final class RequestDuelStart implements IClientIncomingPacket activeChar.onTransactionRequest(targetChar); targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.finer(activeChar.getName() + " requested a duel with " + targetChar.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(targetChar.getName()); activeChar.sendPacket(msg); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java index 2da3b56c0b..d92531c7f1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.L2Clan; @@ -48,10 +47,6 @@ public final class RequestPledgeInfo implements IClientIncomingPacket final L2Clan clan = ClanTable.getInstance().getClan(_clanId); if (clan == null) { - if (Config.DEBUG) - { - _log.warning(getClass().getSimpleName() + ": Clan data for clanId " + _clanId + " is missing for player " + activeChar); - } return; // we have no clan data ?!? should not happen } 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 de928603c2..a1fdeb2cf3 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 @@ -67,11 +67,6 @@ public final class RequestRestart implements IClientIncomingPacket if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && Config.GM_RESTART_FIGHTING)) { - if (Config.DEBUG) - { - _log.finer("Player " + player.getName() + " tried to logout while fighting."); - } - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTART_WHILE_IN_COMBAT); client.sendPacket(RestartResponse.FALSE); return; 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 9ddb2d5222..281601ab37 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 @@ -99,11 +99,6 @@ public final class Say2 implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (Config.DEBUG) - { - _log.info("Say2: Msg Type = '" + _type + "' Text = '" + _text + "'."); - } - final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java index c4fad94c0e..c9d9242f10 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.TradeList; @@ -56,10 +55,6 @@ public final class TradeDone implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - if (Config.DEBUG) - { - _log.warning("player.getTradeList == null in " + getClass().getSimpleName() + " for player " + player.getName()); - } return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 5d7e35eb43..09c1d6ea32 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -195,10 +195,6 @@ public final class TradeRequest implements IClientIncomingPacket if (player.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.finer("Already trading with someone else."); - } client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE); return; } @@ -206,10 +202,6 @@ public final class TradeRequest implements IClientIncomingPacket SystemMessage sm; if (partner.isProcessingRequest() || partner.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.info("Transaction already in progress."); - } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); sm.addString(partner.getName()); client.sendPacket(sm); 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 602093c8ae..0a55aaab22 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 @@ -281,10 +281,6 @@ public final class UseItem implements IClientIncomingPacket { _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } - else if (Config.DEBUG) - { - _log.warning("No Item handler registered for Item Id: " + _itemId + "!"); - } } else if (handler.useItem(activeChar, item, _ctrlPressed)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/MinionList.java index 22ba27c49f..eafbd496c3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/MinionList.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.util; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; @@ -35,8 +34,6 @@ import com.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private static final Logger _log = Logger.getLogger(MinionList.class.getName()); - protected final L2MonsterInstance _master; /** List containing the current spawned minions */ private final List _minionReferences = new CopyOnWriteArrayList<>(); @@ -385,11 +382,6 @@ public class MinionList minion.spawnMe(newX, newY, master.getZ()); - if (Config.DEBUG) - { - _log.info("Spawned minion template " + minion.getId() + " with objid: " + minion.getObjectId() + " to boss " + master.getObjectId() + " ,at: " + minion.getX() + " x, " + minion.getY() + " y, " + minion.getZ() + " z"); - } - return minion; } 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 22595d5182..d1e9b5d9b6 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 @@ -28,8 +28,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -import com.l2jmobius.Config; -import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.commons.util.network.BaseSendablePacket; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -125,11 +123,6 @@ public class GameServerThread extends Thread return; } - if (Config.DEBUG) - { - _log.warning("[C]" + Config.EOL + CommonUtil.printData(data)); - } - L2JGameServerPacketHandler.handlePacket(data, this); } } @@ -235,10 +228,6 @@ public class GameServerThread extends Thread { final byte[] data = sl.getContent(); NewCrypt.appendChecksum(data); - if (Config.DEBUG) - { - _log.finest("[S] " + sl.getClass().getSimpleName() + ":" + Config.EOL + CommonUtil.printData(data)); - } _blowfish.crypt(data, 0, data.length); final int len = data.length + 2; 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 b7865426f2..5adfc93535 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 @@ -223,11 +223,6 @@ public class LoginController { if (rset.next()) { - if (Config.DEBUG) - { - _log.finer("Account '" + login + "' exists."); - } - final AccountInfo info = new AccountInfo(rset.getString("login"), rset.getString("password"), rset.getInt("accessLevel"), rset.getInt("lastServer")); if (!info.checkPassHash(hashBase64)) { 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 da92f648a0..17599078af 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 @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.crypt.LoginCrypt; import com.l2jmobius.commons.util.crypt.ScrambledKeyPair; @@ -261,11 +260,6 @@ public final class L2LoginClient extends MMOClient> @Override public void onDisconnection() { - if (Config.DEBUG) - { - _log.info("DISCONNECTED: " + toString()); - } - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); 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 ee08b6fc80..9be997f496 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 @@ -22,7 +22,6 @@ import java.util.logging.Logger; import javax.crypto.Cipher; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; @@ -64,10 +63,6 @@ public class BlowFishKey extends BaseRecievePacket System.arraycopy(tempDecryptKey, i, key, 0, len - i); server.SetBlowFish(new NewCrypt(key)); - if (Config.DEBUG) - { - _log.info("New BlowFish key received, Blowfih Engine initialized:"); - } server.setLoginConnectionState(GameServerState.BF_CONNECTED); } catch (GeneralSecurityException 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 41571dfac2..4d8945a63d 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 @@ -78,19 +78,10 @@ public class GameServerAuth extends BaseRecievePacket _hosts[i] = readS(); } - if (Config.DEBUG) - { - _log.info("Auth request received"); - } - if (handleRegProcess()) { final AuthResponse ar = new AuthResponse(server.getGameServerInfo().getId()); server.sendPacket(ar); - if (Config.DEBUG) - { - _log.info("Authed: id: " + server.getGameServerInfo().getId()); - } server.setLoginConnectionState(GameServerState.AUTHED); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java index 9d365d85c1..3ce8993621 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.LoginController; @@ -30,8 +27,6 @@ import com.l2jmobius.loginserver.network.loginserverpackets.PlayerAuthResponse; */ public class PlayerAuthRequest extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerAuthRequest.class.getName()); - /** * @param decrypt * @param server @@ -47,28 +42,14 @@ public class PlayerAuthRequest extends BaseRecievePacket final SessionKey sessionKey = new SessionKey(loginKey1, loginKey2, playKey1, playKey2); PlayerAuthResponse authResponse; - if (Config.DEBUG) - { - _log.info("auth request received for Player " + account); - } final SessionKey key = LoginController.getInstance().getKeyForAccount(account); if ((key != null) && key.equals(sessionKey)) { - if (Config.DEBUG) - { - _log.info("auth request: OK"); - } LoginController.getInstance().removeAuthedLoginClient(account); authResponse = new PlayerAuthResponse(account, true); } else { - if (Config.DEBUG) - { - _log.info("auth request: NO"); - _log.info("session key from self: " + key); - _log.info("session key sent: " + sessionKey); - } authResponse = new PlayerAuthResponse(account, false); } server.sendPacket(authResponse); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java index b90ecefded..420e245412 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java @@ -16,11 +16,7 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; /** @@ -28,8 +24,6 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerInGame extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerInGame.class.getName()); - /** * @param decrypt * @param server @@ -42,10 +36,6 @@ public class PlayerInGame extends BaseRecievePacket { final String account = readS(); server.addAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Account " + account + " logged in GameServer: [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } } } } 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 272414ef91..51f1c8a96e 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 @@ -18,9 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; /** @@ -40,9 +38,5 @@ public class PlayerLogout extends BaseRecievePacket final String account = readS(); server.removeAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Player " + account + " logged out from gameserver [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } } } 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 5dd853031a..341c0a3a8c 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 @@ -18,7 +18,6 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.LoginController; @@ -43,9 +42,5 @@ public class PlayerTracert extends BaseRecievePacket final String hop4 = readS(); LoginController.getInstance().setAccountLastTracert(account, pcIp, hop1, hop2, hop3, hop4); - if (Config.DEBUG) - { - _log.info("Saved " + account + " last tracert"); - } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 9d2f783e0e..fb38653977 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -18,8 +18,6 @@ package com.l2jmobius.loginserver.network.serverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; - /** * Fromat: d d: response */ @@ -33,10 +31,6 @@ public final class GGAuth extends L2LoginServerPacket public GGAuth(int response) { _response = response; - if (Config.DEBUG) - { - _log.warning("Reason Hex: " + Integer.toHexString(response)); - } } @Override diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/General.ini b/L2J_Mobius_2.5_Underground/dist/game/config/General.ini index 43ce5a46e4..f14f090ade 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/config/General.ini +++ b/L2J_Mobius_2.5_Underground/dist/game/config/General.ini @@ -688,13 +688,6 @@ AllowReportsFromSameClanMembers = False # Do not touch these if you do not know what you are doing. # These settings are for debugging servers ONLY. They are not meant for LIVE servers. -# Default: False -Debug = False - -# Instances debugging -# Default: False -InstanceDebug = False - # Html action cache debugging # Default: False HtmlActionCacheDebug = False diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index add0fc00ce..d34b4302c7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -20,7 +20,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.data.xml.impl.AdminData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -93,10 +92,6 @@ public final class AdminChangeAccessLevel implements IAdminCommandHandler catch (SQLException se) { activeChar.sendMessage("SQLException while changing character's access level"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } } 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 5352c38082..cb9623a88d 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 @@ -1217,10 +1217,6 @@ public class AdminEditChar implements IAdminCommandHandler sm.addInt(newReputation); player.sendPacket(sm); activeChar.sendMessage("Successfully Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ")."); - if (Config.DEBUG) - { - _log.finer("[SET KARMA] [GM]" + activeChar.getName() + " Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ")."); - } } private void editCharacter(L2PcInstance activeChar, String targetName) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index b6012bde39..33823c066e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.Arrays; import java.util.StringTokenizer; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.enums.Team; @@ -513,10 +512,6 @@ public class AdminEffects implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } } } else if (command.startsWith("admin_ave_abnormal")) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java index fdee3ec383..6f9c555c6f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java @@ -17,9 +17,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminExpSp implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminExpSp.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_add_exp_sp_to_character", @@ -150,10 +146,6 @@ public class AdminExpSp implements IAdminCommandHandler player.addExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + "."); - } } return true; } @@ -197,10 +189,6 @@ public class AdminExpSp implements IAdminCommandHandler player.removeExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + "."); - } } return true; } 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 67a0476e48..5acf20c5b6 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 @@ -122,10 +122,6 @@ public class AdminHeal implements IAdminCommandHandler { target.setCurrentCp(target.getMaxCp()); } - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") healed character " + target.getName()); - } } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index e0b48d8b99..1fff955404 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminInvul implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminInvul.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_invul", @@ -86,19 +82,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setIsInvul(false); text = activeChar.getName() + " is now mortal."; - if (Config.DEBUG) - { - _log.finer("GM: Gm removed invul mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setIsInvul(true); text = activeChar.getName() + " is now invulnerable."; - if (Config.DEBUG) - { - _log.finer("GM: Gm activated invul mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } @@ -110,19 +98,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setUndying(false); text = activeChar.getName() + " is now mortal."; - if (Config.DEBUG) - { - _log.finer("GM: Gm removed undying mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setUndying(true); text = activeChar.getName() + " is now undying."; - if (Config.DEBUG) - { - _log.finer("GM: Gm activated undying mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 1519831ed1..4a5209e59f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -17,7 +17,6 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -36,7 +35,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminKill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminKill.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_kill", @@ -154,10 +152,6 @@ public class AdminKill implements IAdminCommandHandler target.setIsInvul(true); } } - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") killed character " + target.getObjectId()); - } } @Override diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java index 4db018597d..5f2dffa9d6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; @@ -34,7 +31,6 @@ import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; */ public class AdminRes implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_res", @@ -123,11 +119,6 @@ public class AdminRes implements IAdminCommandHandler } doResurrect((L2Character) obj); - - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") resurrected character " + obj.getObjectId()); - } } private void handleNonPlayerRes(L2PcInstance activeChar) 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 8a51638dd2..ea51fdd106 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 @@ -21,7 +21,6 @@ import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; @@ -538,10 +537,6 @@ public class AdminSkill implements IAdminCommandHandler player.sendSkillList(); // Admin info. activeChar.sendMessage("You gave the skill " + name + " to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("[GM]" + activeChar.getName() + " gave skill " + name + " to " + player.getName() + "."); - } activeChar.sendSkillList(); } else @@ -573,10 +568,6 @@ public class AdminSkill implements IAdminCommandHandler player.removeSkill(skill); // Admin information activeChar.sendMessage("You removed the skill " + skillname + " from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("[GM]" + activeChar.getName() + " removed skill " + skillname + " from " + player.getName() + "."); - } activeChar.sendSkillList(); } else 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 7eda72c449..3f807d137a 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 @@ -23,7 +23,6 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.NpcData; @@ -135,10 +134,6 @@ public class AdminTeleport implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - _log.info("admin_walk: " + e); - } } } else if (command.startsWith("admin_move_to")) @@ -564,12 +559,6 @@ public class AdminTeleport implements IAdminCommandHandler spawn.init(); activeChar.sendMessage("Created " + template1.getName() + " on " + target.getObjectId() + "."); - - if (Config.DEBUG) - { - _log.finer("Spawn at X=" + spawn.getX() + " Y=" + spawn.getY() + " Z=" + spawn.getZ()); - _log.warning("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") moved NPC " + target.getObjectId()); - } } catch (Exception e) { 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 740b004b22..d6c31d5495 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 @@ -18,7 +18,6 @@ package handlers.bypasshandlers; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -85,11 +84,6 @@ public class PrivateWarehouse implements IBypassHandler } player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE)); - - if (Config.DEBUG) - { - _log.finer("Source: L2WarehouseInstance.java; Player: " + player.getName() + "; Command: showRetrieveWindow; Message: Showing stored items."); - } } @Override diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 0334844fe8..d195c3e64a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -17,7 +17,6 @@ package handlers.chathandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.ChatType; @@ -38,8 +37,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class ChatGeneral implements IChatHandler { - private static Logger _log = Logger.getLogger(ChatGeneral.class.getName()); - private static final ChatType[] CHAT_TYPES = { ChatType.GENERAL, @@ -63,10 +60,6 @@ public final class ChatGeneral implements IChatHandler else { command = text.substring(1); - if (Config.DEBUG) - { - _log.info("Command: " + command); - } } vch = VoicedCommandHandler.getInstance().getHandler(command); if (vch != null) @@ -76,10 +69,6 @@ public final class ChatGeneral implements IChatHandler } else { - if (Config.DEBUG) - { - _log.warning("No handler registered for bypass '" + command + "'"); - } vcd_used = false; } } diff --git a/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini b/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini index 04bb765318..fe9cc1f9de 100644 --- a/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_2.5_Underground/dist/login/config/LoginServer.ini @@ -125,11 +125,3 @@ LoginRestartSchedule = False # Time in hours. # Default: 24 LoginRestartTime = 24 - - -# --------------------------------------------------------------------------- -# Developer Settings -# --------------------------------------------------------------------------- - -# Default: False -Debug = False diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java index 0e322c58fa..90588f09ce 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java @@ -419,8 +419,6 @@ public final class Config public static boolean SKILL_CHECK_ENABLE; public static boolean SKILL_CHECK_REMOVE; public static boolean SKILL_CHECK_GM; - public static boolean DEBUG; - public static boolean DEBUG_INSTANCES; public static boolean HTML_ACTION_CACHE_DEBUG; public static boolean PACKET_HANDLER_DEBUG; public static boolean DEVELOPER; @@ -1824,8 +1822,6 @@ public final class Config SKILL_CHECK_ENABLE = General.getBoolean("SkillCheckEnable", false); SKILL_CHECK_REMOVE = General.getBoolean("SkillCheckRemove", false); SKILL_CHECK_GM = General.getBoolean("SkillCheckGM", true); - DEBUG = General.getBoolean("Debug", false); - DEBUG_INSTANCES = General.getBoolean("InstanceDebug", false); HTML_ACTION_CACHE_DEBUG = General.getBoolean("HtmlActionCacheDebug", false); PACKET_HANDLER_DEBUG = General.getBoolean("PacketHandlerDebug", false); DEVELOPER = General.getBoolean("Developer", false); @@ -2885,8 +2881,6 @@ public final class Config DATAPACK_ROOT = new File("."); } - DEBUG = ServerSettings.getBoolean("Debug", false); - ACCEPT_NEW_GAMESERVER = ServerSettings.getBoolean("AcceptNewGameServer", true); LOGIN_TRY_BEFORE_BAN = ServerSettings.getInt("LoginTryBeforeBan", 5); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java index fc1fd57c3e..ee076bff4b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java @@ -23,7 +23,6 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.IGameXmlReader; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -42,6 +41,7 @@ public final class HitConditionBonusData implements IGameXmlReader private int highBonus = 0; private int lowBonus = 0; private int darkBonus = 0; + @SuppressWarnings("unused") private int rainBonus = 0; /** @@ -57,16 +57,6 @@ public final class HitConditionBonusData implements IGameXmlReader { parseDatapackFile("data/stats/hitConditionBonus.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded Hit Condition bonuses."); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Front bonus: " + frontBonus); - LOGGER.info(getClass().getSimpleName() + ": Side bonus: " + sideBonus); - LOGGER.info(getClass().getSimpleName() + ": Back bonus: " + backBonus); - LOGGER.info(getClass().getSimpleName() + ": High bonus: " + highBonus); - LOGGER.info(getClass().getSimpleName() + ": Low bonus: " + lowBonus); - LOGGER.info(getClass().getSimpleName() + ": Dark bonus: " + darkBonus); - LOGGER.info(getClass().getSimpleName() + ": Rain bonus: " + rainBonus); - } } @Override diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/AugmentationData.java index 8582c38326..23b5e67b43 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/AugmentationData.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/AugmentationData.java @@ -914,10 +914,6 @@ public class AugmentationData } stat12 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; resultColor=" + resultColor + "; level=" + lifeStoneLevel + "; grade=" + lifeStoneGrade); - } return new Augmentation(((stat34 << 16) + stat12)); } @@ -1047,10 +1043,6 @@ public class AugmentationData // stat12 has stats only stat12 = base + skillsLength + (ACC_STAT_SUBBLOCKSIZE * resultColor) + stat12; - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Accessory augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; level=" + lifeStoneLevel); - } final int augmentationId = ((stat34 << 16) + stat12); return getAugmentation(augmentationId); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/ItemTable.java index 8e700cdd85..4f74f2b04c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/ItemTable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/ItemTable.java @@ -234,11 +234,6 @@ public class ItemTable } } - if (Config.DEBUG) - { - LOGGER.finer(getClass().getSimpleName() + ": Item created: " + item); - } - // Add the L2ItemInstance object to _allObjects of L2world L2World.getInstance().storeObject(item); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 0b8070e37b..d2b606a72a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -108,12 +108,6 @@ public final class CastleManorManager implements IGameXmlReader, IStorable { ThreadPoolManager.scheduleAtFixedRate(this::storeMe, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000); } - - // Send debug message - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode); - } } else { @@ -435,10 +429,6 @@ public final class CastleManorManager implements IGameXmlReader, IStorable } } scheduleModeChange(); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Manor mode changed to " + _mode + "!"); - } } public final void setNextSeedProduction(List list, int castleId) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index c776c03a97..3149d5ff45 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -448,10 +448,6 @@ public final class InstanceManager implements IGameXmlReader { if (_currentInstanceId == Integer.MAX_VALUE) { - if (Config.DEBUG_INSTANCES) - { - LOGGER.info(getClass().getSimpleName() + ": Instance id owerflow, starting from zero."); - } _currentInstanceId = 0; } _currentInstanceId++; 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 0f821abc37..86a1a80e9b 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 @@ -472,11 +472,6 @@ public class CursedWeapon implements INamable public void saveData() { - if (Config.DEBUG) - { - _log.info("CursedWeapon: Saving data to disk."); - } - try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM cursed_weapons WHERE itemId = ?"); PreparedStatement ps = con.prepareStatement("INSERT INTO cursed_weapons (itemId, charId, playerReputation, playerPkKills, nbKills, endTime) VALUES (?, ?, ?, ?, ?, ?)")) 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 9912e7d8e3..77faa268ca 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 @@ -988,10 +988,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(9, getNewLeaderId()); ps.setInt(10, getId()); ps.execute(); - if (Config.DEBUG) - { - _log.finer("New clan leader saved in db: " + getId()); - } } catch (Exception e) { @@ -1033,10 +1029,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(12, getAllyCrestId()); ps.setInt(13, getNewLeaderId()); ps.execute(); - if (Config.DEBUG) - { - _log.finer("New clan saved in db: " + getId()); - } } catch (Exception e) { @@ -1061,10 +1053,6 @@ public class L2Clan implements IIdentifiable, INamable ps1.setLong(3, clanCreateExpiryTime); ps1.setInt(4, member.getObjectId()); ps1.execute(); - if (Config.DEBUG) - { - _log.finer("clan member removed in db: " + getId()); - } // Remove apprentice. ps2.setInt(1, member.getObjectId()); ps2.execute(); @@ -1142,11 +1130,6 @@ public class L2Clan implements IIdentifiable, INamable } } - if (Config.DEBUG && (getName() != null)) - { - _log.info("Restored clan data for \"" + getName() + "\" from database."); - } - restoreSubPledges(); restoreRankPrivs(); restoreSkills(); @@ -1910,11 +1893,6 @@ public class L2Clan implements IIdentifiable, INamable // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } - - if (Config.DEBUG) - { - _log.finer("New sub_clan saved in db: " + getId() + "; " + pledgeType); - } } catch (Exception e) { @@ -1980,10 +1958,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(3, getId()); ps.setInt(4, pledgeType); ps.execute(); - if (Config.DEBUG) - { - _log.finer("Subpledge updated in db: " + getId()); - } } catch (Exception e) { @@ -2428,11 +2402,6 @@ public class L2Clan implements IIdentifiable, INamable return; } - if (Config.DEBUG) - { - _log.finer(player.getObjectId() + "(" + player.getName() + ") requested ally creation from "); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); 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 55ebf4f5c1..f9aa07f44d 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 @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -104,10 +103,6 @@ public class L2DefenderInstance extends L2Attackable } if (!isInsideRadius(getSpawn(), 40, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); @@ -147,11 +142,6 @@ public class L2DefenderInstance extends L2Attackable // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - _log.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java index 4f7386ef47..b982a00c9f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; @@ -99,10 +98,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance { if (!isInsideRadius(getSpawn(), 200, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java index fc636123fb..a7ec0202ed 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -442,10 +442,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -493,10 +489,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -544,10 +536,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Exp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -719,10 +707,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Tele editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -770,10 +754,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Support editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 6a94be63b5..214c883f17 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; */ public class L2GuardInstance extends L2Attackable { - private static Logger _log = Logger.getLogger(L2GuardInstance.class.getName()); - /** * Constructor of L2GuardInstance (use L2Character and L2NpcInstance constructor).
* Actions : @@ -172,11 +168,6 @@ public class L2GuardInstance extends L2Attackable // Check if the L2PcInstance is in the _aggroList of the L2GuardInstance if (containsTarget(player)) { - if (Config.DEBUG) - { - _log.finer(player.getObjectId() + ": Attacked guard " + getObjectId()); - } - // Set the L2PcInstance Intention to AI_INTENTION_ATTACK player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index 11f2e21933..ed9aab530f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; import java.util.Map; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.model.L2SkillLearn; @@ -61,11 +60,6 @@ public class L2NpcInstance extends L2Npc */ public static void showSkillList(L2PcInstance player, L2Npc npc, ClassId classId) { - if (Config.DEBUG) - { - _log.finer("SkillList activated on: " + npc.getObjectId()); - } - final int npcId = npc.getTemplate().getId(); if (npcId == 32611) // Tolonis (Officer) { 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 3b60595841..ca78d727a7 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 @@ -3885,20 +3885,11 @@ public final class L2PcInstance extends L2Playable final L2Summon pet = getPet(); if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return null; } if (isProcessingItem(objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return null; } @@ -10571,20 +10562,11 @@ public final class L2PcInstance extends L2Playable final L2Summon pet = getPet(); if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return false; } if (isProcessingItem(objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return false; } 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 9494559d7d..9af40f494e 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 @@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -207,11 +206,6 @@ public class CharStatus { if ((_regTask == null) && !getActiveChar().isDead()) { - if (Config.DEBUG) - { - _log.finer("HP/MP regen started"); - } - // Get the Regeneration period final int period = Formulas.getRegeneratePeriod(getActiveChar()); @@ -232,11 +226,6 @@ public class CharStatus { if (_regTask != null) { - if (Config.DEBUG) - { - _log.finer("HP/MP regen stop"); - } - // Stop the HP/MP/CP Regeneration task _regTask.cancel(false); _regTask = null; 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 d38ef03cf0..fc216cf183 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 @@ -24,7 +24,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.NpcData; @@ -307,11 +306,6 @@ public final class BlockCheckerEngine _abnormalEnd = true; ThreadPoolManager.execute(new EndEvent()); - - if (Config.DEBUG) - { - _log.info("Handys Block Checker Event at arena " + _arena + " ended due lack of players!"); - } } } catch (Exception e) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index 232944b028..77c2468437 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -128,12 +128,6 @@ public final class Instance implements IIdentifiable, INamable // Notify DP scripts EventDispatcher.getInstance().notifyEventAsync(new OnInstanceCreated(this, player), _template); } - - // Debug logger - if (Config.DEBUG_INSTANCES) - { - LOGGER.info("Instance " + _template.getName() + " (" + _template.getId() + ") has been created with instance id " + getId()); - } } @Override diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 679ddd1b8f..49cd83dca6 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1327,11 +1327,6 @@ public abstract class Inventory extends ItemContainer */ public L2ItemInstance unEquipItemInBodySlot(int slot) { - if (Config.DEBUG) - { - LOGGER.info("Unequip body slot: " + slot); - } - int pdollSlot = -1; switch (slot) 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 8c4ba4eb64..8e4641502a 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 @@ -264,10 +264,6 @@ public final class Skill implements IIdentifiable if (Config.ENABLE_MODIFY_SKILL_REUSE && Config.SKILL_REUSE_LIST.containsKey(_id)) { - if (Config.DEBUG) - { - _log.info("*** Skill " + _name + " (" + _level + ") changed reuse from " + set.getInt("reuseDelay", 0) + " to " + Config.SKILL_REUSE_LIST.get(_id) + " seconds."); - } _reuseDelay = Config.SKILL_REUSE_LIST.get(_id); } else 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 f0fc7726d3..65ee4bbc41 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 @@ -170,10 +170,6 @@ public final class L2GameClient extends ChannelInboundHandler @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - if (Config.DEBUG) - { - LOGGER.log(Level.WARNING, "Network exception caught for: " + toString(), cause); - } } public Channel getChannel() 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 ccd2d1d13a..f92d2c5e23 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 @@ -32,8 +32,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; public final class Action implements IClientIncomingPacket { private int _objectId; + @SuppressWarnings("unused") private int _originX; + @SuppressWarnings("unused") private int _originY; + @SuppressWarnings("unused") private int _originZ; private int _actionId; @@ -51,11 +54,6 @@ public final class Action implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (Config.DEBUG) - { - _log.info(getClass().getSimpleName() + ": " + (_actionId == 0 ? "Simple-click" : "Shift-click") + " Target object ID: " + _objectId + " orignX: " + _originX + " orignY: " + _originY + " orignZ: " + _originZ); - } - // Get the current L2PcInstance of the player final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 8890047012..22dfca0017 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.LoginServerThread; import com.l2jmobius.gameserver.LoginServerThread.SessionKey; @@ -60,11 +59,6 @@ public final class AuthLogin implements IClientIncomingPacket } final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2); - if (Config.DEBUG) - { - _log.info("user:" + _loginName); - _log.info("key:" + key); - } // avoid potential exploits if (client.getAccountName() == null) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 7f9cb857c7..f202f197b2 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.model.Location; @@ -53,10 +52,6 @@ public final class CannotMoveAnymore implements IClientIncomingPacket return; } - if (Config.DEBUG) - { - _log.finer("client: x:" + _x + " y:" + _y + " z:" + _z + " server x:" + player.getX() + " y:" + player.getY() + " z:" + player.getZ()); - } if (player.getAI() != null) { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); 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 06464d9911..f530aead0c 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 @@ -92,11 +92,6 @@ public final class CharacterCreate implements IClientIncomingPacket // Last Verified: May 30, 2009 - Gracia Final - Players are able to create characters with names consisting of as little as 1,2,3 letter/number combinations. if ((_name.length() < 1) || (_name.length() > 16)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Your title cannot exceed 16 characters in length. Please try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS)); return; } @@ -122,11 +117,6 @@ public final class CharacterCreate implements IClientIncomingPacket // Last Verified: May 30, 2009 - Gracia Final if (!Util.isAlphaNumeric(_name) || !isValidName(_name)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Incorrect name. Please try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_INCORRECT_NAME)); return; } @@ -165,21 +155,11 @@ public final class CharacterCreate implements IClientIncomingPacket { if ((CharNameTable.getInstance().getAccountCharacterCount(client.getAccountName()) >= Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT) && (Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT != 0)) { - if (Config.DEBUG) - { - _log.finer("Max number of characters reached. Creation failed."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_TOO_MANY_CHARACTERS)); return; } else if (CharNameTable.getInstance().doesCharNameExist(_name)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Message generated: You cannot create another character. Please delete the existing character and try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS)); return; } @@ -187,11 +167,6 @@ public final class CharacterCreate implements IClientIncomingPacket template = PlayerTemplateData.getInstance().getTemplate(_classId); if ((template == null) || (ClassId.getClassId(_classId).level() > 0)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: " + _name + " classId: " + _classId + " Template: " + template + " Message generated: Your character creation has failed."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -286,11 +261,6 @@ public final class CharacterCreate implements IClientIncomingPacket private void initNewChar(L2GameClient client, L2PcInstance newChar) { - if (Config.DEBUG) - { - _log.finer("Character init start"); - } - L2World.getInstance().storeObject(newChar); if (Config.STARTING_ADENA > 0) @@ -350,11 +320,6 @@ public final class CharacterCreate implements IClientIncomingPacket for (L2SkillLearn skill : SkillTreesData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true)) { - if (Config.DEBUG) - { - _log.finer("Adding starter skill:" + skill.getSkillId() + " / " + skill.getSkillLevel()); - } - newChar.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true); } @@ -372,10 +337,5 @@ public final class CharacterCreate implements IClientIncomingPacket final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.setCharSelection(cl.getCharInfo()); - - if (Config.DEBUG) - { - _log.finer("Character init end"); - } } } 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 bf1369b884..cd62eefdba 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 @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.enums.CharacterDeleteFailType; import com.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -55,11 +54,6 @@ public final class CharacterDelete implements IClientIncomingPacket // return; // } - if (Config.DEBUG) - { - _log.finer("deleting slot:" + _charSlot); - } - try { final CharacterDeleteFailType failType = client.markToDeleteChar(_charSlot); 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 9a3530ea8c..579b270fb4 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 @@ -145,12 +145,6 @@ public class CharacterSelect implements IClientIncomingPacket } } - // The L2PcInstance must be created here, so that it can be attached to the L2GameClient - if (Config.DEBUG) - { - _log.finer("selected slot:" + _charSlot); - } - // load up character from disk final L2PcInstance cha = client.loadCharFromDisk(_charSlot); if (cha == null) 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 e6938bda6d..9321940795 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 @@ -168,13 +168,10 @@ public class EnterWorld implements IClientIncomingPacket vars.remove("INSTANCE_RESTORE"); } - if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) - { - if (Config.DEBUG) - { - _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); - } - } + // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) + // { + // _log.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/RequestDropItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index f11a357d3e..04b62b31bf 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 @@ -149,20 +149,12 @@ public final class RequestDropItem implements IClientIncomingPacket if ((L2Item.TYPE2_QUEST == item.getItem().getType2()) && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ":player tried to drop quest item"); - } activeChar.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED_OR_EXCHANGED); return; } if (!activeChar.isInsideRadius(_x, _y, 0, 150, false, false) || (Math.abs(_z - activeChar.getZ()) > 50)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ": trying to drop too far away"); - } activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DISCARD_SOMETHING_THAT_FAR_AWAY_FROM_YOU); return; } @@ -173,11 +165,6 @@ public final class RequestDropItem implements IClientIncomingPacket return; } - if (Config.DEBUG) - { - _log.finer("requested drop item " + _objectId + "(" + item.getCount() + ") at " + _x + "/" + _y + "/" + _z); - } - if (item.isEquipped()) { activeChar.getInventory().unEquipItemInSlot(item.getLocationSlot()); @@ -187,11 +174,6 @@ public final class RequestDropItem implements IClientIncomingPacket final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); - if (Config.DEBUG) - { - _log.finer("dropping " + _objectId + " item(" + _count + ") at: " + _x + " " + _y + " " + _z); - } - // activeChar.broadcastUserInfo(); if (activeChar.isGM()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java index ee8bcd656b..c1d19b5e5b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData; @@ -193,11 +192,6 @@ public final class RequestDuelStart implements IClientIncomingPacket activeChar.onTransactionRequest(partyLeader); partyLeader.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.finer(activeChar.getName() + " requested a duel with " + partyLeader.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(partyLeader.getName()); activeChar.sendPacket(msg); @@ -222,11 +216,6 @@ public final class RequestDuelStart implements IClientIncomingPacket activeChar.onTransactionRequest(targetChar); targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.finer(activeChar.getName() + " requested a duel with " + targetChar.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(targetChar.getName()); activeChar.sendPacket(msg); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java index 2da3b56c0b..d92531c7f1 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.L2Clan; @@ -48,10 +47,6 @@ public final class RequestPledgeInfo implements IClientIncomingPacket final L2Clan clan = ClanTable.getInstance().getClan(_clanId); if (clan == null) { - if (Config.DEBUG) - { - _log.warning(getClass().getSimpleName() + ": Clan data for clanId " + _clanId + " is missing for player " + activeChar); - } return; // we have no clan data ?!? should not happen } 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 de928603c2..a1fdeb2cf3 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 @@ -67,11 +67,6 @@ public final class RequestRestart implements IClientIncomingPacket if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && Config.GM_RESTART_FIGHTING)) { - if (Config.DEBUG) - { - _log.finer("Player " + player.getName() + " tried to logout while fighting."); - } - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTART_WHILE_IN_COMBAT); client.sendPacket(RestartResponse.FALSE); return; 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 9ddb2d5222..281601ab37 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 @@ -99,11 +99,6 @@ public final class Say2 implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (Config.DEBUG) - { - _log.info("Say2: Msg Type = '" + _type + "' Text = '" + _text + "'."); - } - final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java index c4fad94c0e..c9d9242f10 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.TradeList; @@ -56,10 +55,6 @@ public final class TradeDone implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - if (Config.DEBUG) - { - _log.warning("player.getTradeList == null in " + getClass().getSimpleName() + " for player " + player.getName()); - } return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 5d7e35eb43..09c1d6ea32 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -195,10 +195,6 @@ public final class TradeRequest implements IClientIncomingPacket if (player.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.finer("Already trading with someone else."); - } client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE); return; } @@ -206,10 +202,6 @@ public final class TradeRequest implements IClientIncomingPacket SystemMessage sm; if (partner.isProcessingRequest() || partner.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.info("Transaction already in progress."); - } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); sm.addString(partner.getName()); client.sendPacket(sm); 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 602093c8ae..0a55aaab22 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 @@ -281,10 +281,6 @@ public final class UseItem implements IClientIncomingPacket { _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } - else if (Config.DEBUG) - { - _log.warning("No Item handler registered for Item Id: " + _itemId + "!"); - } } else if (handler.useItem(activeChar, item, _ctrlPressed)) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/MinionList.java index 22ba27c49f..eafbd496c3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/MinionList.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.util; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; @@ -35,8 +34,6 @@ import com.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private static final Logger _log = Logger.getLogger(MinionList.class.getName()); - protected final L2MonsterInstance _master; /** List containing the current spawned minions */ private final List _minionReferences = new CopyOnWriteArrayList<>(); @@ -385,11 +382,6 @@ public class MinionList minion.spawnMe(newX, newY, master.getZ()); - if (Config.DEBUG) - { - _log.info("Spawned minion template " + minion.getId() + " with objid: " + minion.getObjectId() + " to boss " + master.getObjectId() + " ,at: " + minion.getX() + " x, " + minion.getY() + " y, " + minion.getZ() + " z"); - } - return minion; } 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 22595d5182..d1e9b5d9b6 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 @@ -28,8 +28,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -import com.l2jmobius.Config; -import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.commons.util.network.BaseSendablePacket; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -125,11 +123,6 @@ public class GameServerThread extends Thread return; } - if (Config.DEBUG) - { - _log.warning("[C]" + Config.EOL + CommonUtil.printData(data)); - } - L2JGameServerPacketHandler.handlePacket(data, this); } } @@ -235,10 +228,6 @@ public class GameServerThread extends Thread { final byte[] data = sl.getContent(); NewCrypt.appendChecksum(data); - if (Config.DEBUG) - { - _log.finest("[S] " + sl.getClass().getSimpleName() + ":" + Config.EOL + CommonUtil.printData(data)); - } _blowfish.crypt(data, 0, data.length); final int len = data.length + 2; 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 b7865426f2..5adfc93535 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 @@ -223,11 +223,6 @@ public class LoginController { if (rset.next()) { - if (Config.DEBUG) - { - _log.finer("Account '" + login + "' exists."); - } - final AccountInfo info = new AccountInfo(rset.getString("login"), rset.getString("password"), rset.getInt("accessLevel"), rset.getInt("lastServer")); if (!info.checkPassHash(hashBase64)) { 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 da92f648a0..17599078af 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 @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.crypt.LoginCrypt; import com.l2jmobius.commons.util.crypt.ScrambledKeyPair; @@ -261,11 +260,6 @@ public final class L2LoginClient extends MMOClient> @Override public void onDisconnection() { - if (Config.DEBUG) - { - _log.info("DISCONNECTED: " + toString()); - } - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); 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 ee08b6fc80..9be997f496 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 @@ -22,7 +22,6 @@ import java.util.logging.Logger; import javax.crypto.Cipher; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; @@ -64,10 +63,6 @@ public class BlowFishKey extends BaseRecievePacket System.arraycopy(tempDecryptKey, i, key, 0, len - i); server.SetBlowFish(new NewCrypt(key)); - if (Config.DEBUG) - { - _log.info("New BlowFish key received, Blowfih Engine initialized:"); - } server.setLoginConnectionState(GameServerState.BF_CONNECTED); } catch (GeneralSecurityException 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 41571dfac2..4d8945a63d 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 @@ -78,19 +78,10 @@ public class GameServerAuth extends BaseRecievePacket _hosts[i] = readS(); } - if (Config.DEBUG) - { - _log.info("Auth request received"); - } - if (handleRegProcess()) { final AuthResponse ar = new AuthResponse(server.getGameServerInfo().getId()); server.sendPacket(ar); - if (Config.DEBUG) - { - _log.info("Authed: id: " + server.getGameServerInfo().getId()); - } server.setLoginConnectionState(GameServerState.AUTHED); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java index 9d365d85c1..3ce8993621 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.LoginController; @@ -30,8 +27,6 @@ import com.l2jmobius.loginserver.network.loginserverpackets.PlayerAuthResponse; */ public class PlayerAuthRequest extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerAuthRequest.class.getName()); - /** * @param decrypt * @param server @@ -47,28 +42,14 @@ public class PlayerAuthRequest extends BaseRecievePacket final SessionKey sessionKey = new SessionKey(loginKey1, loginKey2, playKey1, playKey2); PlayerAuthResponse authResponse; - if (Config.DEBUG) - { - _log.info("auth request received for Player " + account); - } final SessionKey key = LoginController.getInstance().getKeyForAccount(account); if ((key != null) && key.equals(sessionKey)) { - if (Config.DEBUG) - { - _log.info("auth request: OK"); - } LoginController.getInstance().removeAuthedLoginClient(account); authResponse = new PlayerAuthResponse(account, true); } else { - if (Config.DEBUG) - { - _log.info("auth request: NO"); - _log.info("session key from self: " + key); - _log.info("session key sent: " + sessionKey); - } authResponse = new PlayerAuthResponse(account, false); } server.sendPacket(authResponse); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java index b90ecefded..420e245412 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java @@ -16,11 +16,7 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; /** @@ -28,8 +24,6 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerInGame extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerInGame.class.getName()); - /** * @param decrypt * @param server @@ -42,10 +36,6 @@ public class PlayerInGame extends BaseRecievePacket { final String account = readS(); server.addAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Account " + account + " logged in GameServer: [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } } } } 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 272414ef91..51f1c8a96e 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 @@ -18,9 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; /** @@ -40,9 +38,5 @@ public class PlayerLogout extends BaseRecievePacket final String account = readS(); server.removeAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Player " + account + " logged out from gameserver [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } } } 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 5dd853031a..341c0a3a8c 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 @@ -18,7 +18,6 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.LoginController; @@ -43,9 +42,5 @@ public class PlayerTracert extends BaseRecievePacket final String hop4 = readS(); LoginController.getInstance().setAccountLastTracert(account, pcIp, hop1, hop2, hop3, hop4); - if (Config.DEBUG) - { - _log.info("Saved " + account + " last tracert"); - } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 9d2f783e0e..fb38653977 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -18,8 +18,6 @@ package com.l2jmobius.loginserver.network.serverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; - /** * Fromat: d d: response */ @@ -33,10 +31,6 @@ public final class GGAuth extends L2LoginServerPacket public GGAuth(int response) { _response = response; - if (Config.DEBUG) - { - _log.warning("Reason Hex: " + Integer.toHexString(response)); - } } @Override diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/General.ini b/L2J_Mobius_3.0_Helios/dist/game/config/General.ini index 43ce5a46e4..f14f090ade 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/config/General.ini +++ b/L2J_Mobius_3.0_Helios/dist/game/config/General.ini @@ -688,13 +688,6 @@ AllowReportsFromSameClanMembers = False # Do not touch these if you do not know what you are doing. # These settings are for debugging servers ONLY. They are not meant for LIVE servers. -# Default: False -Debug = False - -# Instances debugging -# Default: False -InstanceDebug = False - # Html action cache debugging # Default: False HtmlActionCacheDebug = False diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index add0fc00ce..d34b4302c7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -20,7 +20,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.data.xml.impl.AdminData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -93,10 +92,6 @@ public final class AdminChangeAccessLevel implements IAdminCommandHandler catch (SQLException se) { activeChar.sendMessage("SQLException while changing character's access level"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } } 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 5352c38082..cb9623a88d 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 @@ -1217,10 +1217,6 @@ public class AdminEditChar implements IAdminCommandHandler sm.addInt(newReputation); player.sendPacket(sm); activeChar.sendMessage("Successfully Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ")."); - if (Config.DEBUG) - { - _log.finer("[SET KARMA] [GM]" + activeChar.getName() + " Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ")."); - } } private void editCharacter(L2PcInstance activeChar, String targetName) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index b6012bde39..33823c066e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.Arrays; import java.util.StringTokenizer; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.enums.Team; @@ -513,10 +512,6 @@ public class AdminEffects implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } } } else if (command.startsWith("admin_ave_abnormal")) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java index fdee3ec383..6f9c555c6f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java @@ -17,9 +17,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminExpSp implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminExpSp.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_add_exp_sp_to_character", @@ -150,10 +146,6 @@ public class AdminExpSp implements IAdminCommandHandler player.addExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + "."); - } } return true; } @@ -197,10 +189,6 @@ public class AdminExpSp implements IAdminCommandHandler player.removeExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + "."); - } } return true; } 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 67a0476e48..5acf20c5b6 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 @@ -122,10 +122,6 @@ public class AdminHeal implements IAdminCommandHandler { target.setCurrentCp(target.getMaxCp()); } - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") healed character " + target.getName()); - } } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index e0b48d8b99..1fff955404 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminInvul implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminInvul.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_invul", @@ -86,19 +82,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setIsInvul(false); text = activeChar.getName() + " is now mortal."; - if (Config.DEBUG) - { - _log.finer("GM: Gm removed invul mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setIsInvul(true); text = activeChar.getName() + " is now invulnerable."; - if (Config.DEBUG) - { - _log.finer("GM: Gm activated invul mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } @@ -110,19 +98,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setUndying(false); text = activeChar.getName() + " is now mortal."; - if (Config.DEBUG) - { - _log.finer("GM: Gm removed undying mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setUndying(true); text = activeChar.getName() + " is now undying."; - if (Config.DEBUG) - { - _log.finer("GM: Gm activated undying mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 1519831ed1..4a5209e59f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -17,7 +17,6 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -36,7 +35,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminKill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminKill.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_kill", @@ -154,10 +152,6 @@ public class AdminKill implements IAdminCommandHandler target.setIsInvul(true); } } - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") killed character " + target.getObjectId()); - } } @Override diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java index 4db018597d..5f2dffa9d6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; @@ -34,7 +31,6 @@ import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; */ public class AdminRes implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_res", @@ -123,11 +119,6 @@ public class AdminRes implements IAdminCommandHandler } doResurrect((L2Character) obj); - - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") resurrected character " + obj.getObjectId()); - } } private void handleNonPlayerRes(L2PcInstance activeChar) 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 8a51638dd2..ea51fdd106 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 @@ -21,7 +21,6 @@ import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; @@ -538,10 +537,6 @@ public class AdminSkill implements IAdminCommandHandler player.sendSkillList(); // Admin info. activeChar.sendMessage("You gave the skill " + name + " to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("[GM]" + activeChar.getName() + " gave skill " + name + " to " + player.getName() + "."); - } activeChar.sendSkillList(); } else @@ -573,10 +568,6 @@ public class AdminSkill implements IAdminCommandHandler player.removeSkill(skill); // Admin information activeChar.sendMessage("You removed the skill " + skillname + " from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("[GM]" + activeChar.getName() + " removed skill " + skillname + " from " + player.getName() + "."); - } activeChar.sendSkillList(); } else 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 7eda72c449..3f807d137a 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 @@ -23,7 +23,6 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.NpcData; @@ -135,10 +134,6 @@ public class AdminTeleport implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - _log.info("admin_walk: " + e); - } } } else if (command.startsWith("admin_move_to")) @@ -564,12 +559,6 @@ public class AdminTeleport implements IAdminCommandHandler spawn.init(); activeChar.sendMessage("Created " + template1.getName() + " on " + target.getObjectId() + "."); - - if (Config.DEBUG) - { - _log.finer("Spawn at X=" + spawn.getX() + " Y=" + spawn.getY() + " Z=" + spawn.getZ()); - _log.warning("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") moved NPC " + target.getObjectId()); - } } catch (Exception e) { 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 740b004b22..d6c31d5495 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 @@ -18,7 +18,6 @@ package handlers.bypasshandlers; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -85,11 +84,6 @@ public class PrivateWarehouse implements IBypassHandler } player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE)); - - if (Config.DEBUG) - { - _log.finer("Source: L2WarehouseInstance.java; Player: " + player.getName() + "; Command: showRetrieveWindow; Message: Showing stored items."); - } } @Override diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 0334844fe8..d195c3e64a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -17,7 +17,6 @@ package handlers.chathandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.ChatType; @@ -38,8 +37,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class ChatGeneral implements IChatHandler { - private static Logger _log = Logger.getLogger(ChatGeneral.class.getName()); - private static final ChatType[] CHAT_TYPES = { ChatType.GENERAL, @@ -63,10 +60,6 @@ public final class ChatGeneral implements IChatHandler else { command = text.substring(1); - if (Config.DEBUG) - { - _log.info("Command: " + command); - } } vch = VoicedCommandHandler.getInstance().getHandler(command); if (vch != null) @@ -76,10 +69,6 @@ public final class ChatGeneral implements IChatHandler } else { - if (Config.DEBUG) - { - _log.warning("No handler registered for bypass '" + command + "'"); - } vcd_used = false; } } diff --git a/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini b/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini index 04bb765318..fe9cc1f9de 100644 --- a/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_3.0_Helios/dist/login/config/LoginServer.ini @@ -125,11 +125,3 @@ LoginRestartSchedule = False # Time in hours. # Default: 24 LoginRestartTime = 24 - - -# --------------------------------------------------------------------------- -# Developer Settings -# --------------------------------------------------------------------------- - -# Default: False -Debug = False diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java index 421045b50d..67c25f74e6 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java @@ -419,8 +419,6 @@ public final class Config public static boolean SKILL_CHECK_ENABLE; public static boolean SKILL_CHECK_REMOVE; public static boolean SKILL_CHECK_GM; - public static boolean DEBUG; - public static boolean DEBUG_INSTANCES; public static boolean HTML_ACTION_CACHE_DEBUG; public static boolean PACKET_HANDLER_DEBUG; public static boolean DEVELOPER; @@ -1832,8 +1830,6 @@ public final class Config SKILL_CHECK_ENABLE = General.getBoolean("SkillCheckEnable", false); SKILL_CHECK_REMOVE = General.getBoolean("SkillCheckRemove", false); SKILL_CHECK_GM = General.getBoolean("SkillCheckGM", true); - DEBUG = General.getBoolean("Debug", false); - DEBUG_INSTANCES = General.getBoolean("InstanceDebug", false); HTML_ACTION_CACHE_DEBUG = General.getBoolean("HtmlActionCacheDebug", false); PACKET_HANDLER_DEBUG = General.getBoolean("PacketHandlerDebug", false); DEVELOPER = General.getBoolean("Developer", false); @@ -2902,8 +2898,6 @@ public final class Config DATAPACK_ROOT = new File("."); } - DEBUG = ServerSettings.getBoolean("Debug", false); - ACCEPT_NEW_GAMESERVER = ServerSettings.getBoolean("AcceptNewGameServer", true); LOGIN_TRY_BEFORE_BAN = ServerSettings.getInt("LoginTryBeforeBan", 5); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java index fc1fd57c3e..ee076bff4b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java @@ -23,7 +23,6 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.IGameXmlReader; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -42,6 +41,7 @@ public final class HitConditionBonusData implements IGameXmlReader private int highBonus = 0; private int lowBonus = 0; private int darkBonus = 0; + @SuppressWarnings("unused") private int rainBonus = 0; /** @@ -57,16 +57,6 @@ public final class HitConditionBonusData implements IGameXmlReader { parseDatapackFile("data/stats/hitConditionBonus.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded Hit Condition bonuses."); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Front bonus: " + frontBonus); - LOGGER.info(getClass().getSimpleName() + ": Side bonus: " + sideBonus); - LOGGER.info(getClass().getSimpleName() + ": Back bonus: " + backBonus); - LOGGER.info(getClass().getSimpleName() + ": High bonus: " + highBonus); - LOGGER.info(getClass().getSimpleName() + ": Low bonus: " + lowBonus); - LOGGER.info(getClass().getSimpleName() + ": Dark bonus: " + darkBonus); - LOGGER.info(getClass().getSimpleName() + ": Rain bonus: " + rainBonus); - } } @Override diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/AugmentationData.java index 8582c38326..23b5e67b43 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/AugmentationData.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/AugmentationData.java @@ -914,10 +914,6 @@ public class AugmentationData } stat12 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; resultColor=" + resultColor + "; level=" + lifeStoneLevel + "; grade=" + lifeStoneGrade); - } return new Augmentation(((stat34 << 16) + stat12)); } @@ -1047,10 +1043,6 @@ public class AugmentationData // stat12 has stats only stat12 = base + skillsLength + (ACC_STAT_SUBBLOCKSIZE * resultColor) + stat12; - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Accessory augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; level=" + lifeStoneLevel); - } final int augmentationId = ((stat34 << 16) + stat12); return getAugmentation(augmentationId); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/ItemTable.java index 8e700cdd85..4f74f2b04c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/ItemTable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/ItemTable.java @@ -234,11 +234,6 @@ public class ItemTable } } - if (Config.DEBUG) - { - LOGGER.finer(getClass().getSimpleName() + ": Item created: " + item); - } - // Add the L2ItemInstance object to _allObjects of L2world L2World.getInstance().storeObject(item); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 0b8070e37b..d2b606a72a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -108,12 +108,6 @@ public final class CastleManorManager implements IGameXmlReader, IStorable { ThreadPoolManager.scheduleAtFixedRate(this::storeMe, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000); } - - // Send debug message - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode); - } } else { @@ -435,10 +429,6 @@ public final class CastleManorManager implements IGameXmlReader, IStorable } } scheduleModeChange(); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Manor mode changed to " + _mode + "!"); - } } public final void setNextSeedProduction(List list, int castleId) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index c776c03a97..3149d5ff45 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -448,10 +448,6 @@ public final class InstanceManager implements IGameXmlReader { if (_currentInstanceId == Integer.MAX_VALUE) { - if (Config.DEBUG_INSTANCES) - { - LOGGER.info(getClass().getSimpleName() + ": Instance id owerflow, starting from zero."); - } _currentInstanceId = 0; } _currentInstanceId++; 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 0f821abc37..86a1a80e9b 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 @@ -472,11 +472,6 @@ public class CursedWeapon implements INamable public void saveData() { - if (Config.DEBUG) - { - _log.info("CursedWeapon: Saving data to disk."); - } - try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM cursed_weapons WHERE itemId = ?"); PreparedStatement ps = con.prepareStatement("INSERT INTO cursed_weapons (itemId, charId, playerReputation, playerPkKills, nbKills, endTime) VALUES (?, ?, ?, ?, ?, ?)")) 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 9912e7d8e3..77faa268ca 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 @@ -988,10 +988,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(9, getNewLeaderId()); ps.setInt(10, getId()); ps.execute(); - if (Config.DEBUG) - { - _log.finer("New clan leader saved in db: " + getId()); - } } catch (Exception e) { @@ -1033,10 +1029,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(12, getAllyCrestId()); ps.setInt(13, getNewLeaderId()); ps.execute(); - if (Config.DEBUG) - { - _log.finer("New clan saved in db: " + getId()); - } } catch (Exception e) { @@ -1061,10 +1053,6 @@ public class L2Clan implements IIdentifiable, INamable ps1.setLong(3, clanCreateExpiryTime); ps1.setInt(4, member.getObjectId()); ps1.execute(); - if (Config.DEBUG) - { - _log.finer("clan member removed in db: " + getId()); - } // Remove apprentice. ps2.setInt(1, member.getObjectId()); ps2.execute(); @@ -1142,11 +1130,6 @@ public class L2Clan implements IIdentifiable, INamable } } - if (Config.DEBUG && (getName() != null)) - { - _log.info("Restored clan data for \"" + getName() + "\" from database."); - } - restoreSubPledges(); restoreRankPrivs(); restoreSkills(); @@ -1910,11 +1893,6 @@ public class L2Clan implements IIdentifiable, INamable // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } - - if (Config.DEBUG) - { - _log.finer("New sub_clan saved in db: " + getId() + "; " + pledgeType); - } } catch (Exception e) { @@ -1980,10 +1958,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(3, getId()); ps.setInt(4, pledgeType); ps.execute(); - if (Config.DEBUG) - { - _log.finer("Subpledge updated in db: " + getId()); - } } catch (Exception e) { @@ -2428,11 +2402,6 @@ public class L2Clan implements IIdentifiable, INamable return; } - if (Config.DEBUG) - { - _log.finer(player.getObjectId() + "(" + player.getName() + ") requested ally creation from "); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); 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 55ebf4f5c1..f9aa07f44d 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 @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -104,10 +103,6 @@ public class L2DefenderInstance extends L2Attackable } if (!isInsideRadius(getSpawn(), 40, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); @@ -147,11 +142,6 @@ public class L2DefenderInstance extends L2Attackable // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - _log.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java index 4f7386ef47..b982a00c9f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; @@ -99,10 +98,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance { if (!isInsideRadius(getSpawn(), 200, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java index fc636123fb..a7ec0202ed 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -442,10 +442,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -493,10 +489,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -544,10 +536,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Exp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -719,10 +707,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Tele editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -770,10 +754,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Support editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 6a94be63b5..214c883f17 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; */ public class L2GuardInstance extends L2Attackable { - private static Logger _log = Logger.getLogger(L2GuardInstance.class.getName()); - /** * Constructor of L2GuardInstance (use L2Character and L2NpcInstance constructor).
* Actions : @@ -172,11 +168,6 @@ public class L2GuardInstance extends L2Attackable // Check if the L2PcInstance is in the _aggroList of the L2GuardInstance if (containsTarget(player)) { - if (Config.DEBUG) - { - _log.finer(player.getObjectId() + ": Attacked guard " + getObjectId()); - } - // Set the L2PcInstance Intention to AI_INTENTION_ATTACK player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index 11f2e21933..ed9aab530f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; import java.util.Map; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.model.L2SkillLearn; @@ -61,11 +60,6 @@ public class L2NpcInstance extends L2Npc */ public static void showSkillList(L2PcInstance player, L2Npc npc, ClassId classId) { - if (Config.DEBUG) - { - _log.finer("SkillList activated on: " + npc.getObjectId()); - } - final int npcId = npc.getTemplate().getId(); if (npcId == 32611) // Tolonis (Officer) { 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 706ba94033..201dd8931f 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 @@ -3887,20 +3887,11 @@ public final class L2PcInstance extends L2Playable final L2Summon pet = getPet(); if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return null; } if (isProcessingItem(objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return null; } @@ -10581,20 +10572,11 @@ public final class L2PcInstance extends L2Playable final L2Summon pet = getPet(); if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return false; } if (isProcessingItem(objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return false; } 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 9494559d7d..9af40f494e 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 @@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -207,11 +206,6 @@ public class CharStatus { if ((_regTask == null) && !getActiveChar().isDead()) { - if (Config.DEBUG) - { - _log.finer("HP/MP regen started"); - } - // Get the Regeneration period final int period = Formulas.getRegeneratePeriod(getActiveChar()); @@ -232,11 +226,6 @@ public class CharStatus { if (_regTask != null) { - if (Config.DEBUG) - { - _log.finer("HP/MP regen stop"); - } - // Stop the HP/MP/CP Regeneration task _regTask.cancel(false); _regTask = null; 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 d38ef03cf0..fc216cf183 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 @@ -24,7 +24,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.NpcData; @@ -307,11 +306,6 @@ public final class BlockCheckerEngine _abnormalEnd = true; ThreadPoolManager.execute(new EndEvent()); - - if (Config.DEBUG) - { - _log.info("Handys Block Checker Event at arena " + _arena + " ended due lack of players!"); - } } } catch (Exception e) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index 232944b028..77c2468437 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -128,12 +128,6 @@ public final class Instance implements IIdentifiable, INamable // Notify DP scripts EventDispatcher.getInstance().notifyEventAsync(new OnInstanceCreated(this, player), _template); } - - // Debug logger - if (Config.DEBUG_INSTANCES) - { - LOGGER.info("Instance " + _template.getName() + " (" + _template.getId() + ") has been created with instance id " + getId()); - } } @Override diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 679ddd1b8f..49cd83dca6 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1327,11 +1327,6 @@ public abstract class Inventory extends ItemContainer */ public L2ItemInstance unEquipItemInBodySlot(int slot) { - if (Config.DEBUG) - { - LOGGER.info("Unequip body slot: " + slot); - } - int pdollSlot = -1; switch (slot) 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 8c4ba4eb64..8e4641502a 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 @@ -264,10 +264,6 @@ public final class Skill implements IIdentifiable if (Config.ENABLE_MODIFY_SKILL_REUSE && Config.SKILL_REUSE_LIST.containsKey(_id)) { - if (Config.DEBUG) - { - _log.info("*** Skill " + _name + " (" + _level + ") changed reuse from " + set.getInt("reuseDelay", 0) + " to " + Config.SKILL_REUSE_LIST.get(_id) + " seconds."); - } _reuseDelay = Config.SKILL_REUSE_LIST.get(_id); } else 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 f0fc7726d3..65ee4bbc41 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 @@ -170,10 +170,6 @@ public final class L2GameClient extends ChannelInboundHandler @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - if (Config.DEBUG) - { - LOGGER.log(Level.WARNING, "Network exception caught for: " + toString(), cause); - } } public Channel getChannel() 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 ccd2d1d13a..f92d2c5e23 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 @@ -32,8 +32,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; public final class Action implements IClientIncomingPacket { private int _objectId; + @SuppressWarnings("unused") private int _originX; + @SuppressWarnings("unused") private int _originY; + @SuppressWarnings("unused") private int _originZ; private int _actionId; @@ -51,11 +54,6 @@ public final class Action implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (Config.DEBUG) - { - _log.info(getClass().getSimpleName() + ": " + (_actionId == 0 ? "Simple-click" : "Shift-click") + " Target object ID: " + _objectId + " orignX: " + _originX + " orignY: " + _originY + " orignZ: " + _originZ); - } - // Get the current L2PcInstance of the player final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 8890047012..22dfca0017 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.LoginServerThread; import com.l2jmobius.gameserver.LoginServerThread.SessionKey; @@ -60,11 +59,6 @@ public final class AuthLogin implements IClientIncomingPacket } final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2); - if (Config.DEBUG) - { - _log.info("user:" + _loginName); - _log.info("key:" + key); - } // avoid potential exploits if (client.getAccountName() == null) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 7f9cb857c7..f202f197b2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.model.Location; @@ -53,10 +52,6 @@ public final class CannotMoveAnymore implements IClientIncomingPacket return; } - if (Config.DEBUG) - { - _log.finer("client: x:" + _x + " y:" + _y + " z:" + _z + " server x:" + player.getX() + " y:" + player.getY() + " z:" + player.getZ()); - } if (player.getAI() != null) { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); 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 06464d9911..f530aead0c 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 @@ -92,11 +92,6 @@ public final class CharacterCreate implements IClientIncomingPacket // Last Verified: May 30, 2009 - Gracia Final - Players are able to create characters with names consisting of as little as 1,2,3 letter/number combinations. if ((_name.length() < 1) || (_name.length() > 16)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Your title cannot exceed 16 characters in length. Please try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS)); return; } @@ -122,11 +117,6 @@ public final class CharacterCreate implements IClientIncomingPacket // Last Verified: May 30, 2009 - Gracia Final if (!Util.isAlphaNumeric(_name) || !isValidName(_name)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Incorrect name. Please try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_INCORRECT_NAME)); return; } @@ -165,21 +155,11 @@ public final class CharacterCreate implements IClientIncomingPacket { if ((CharNameTable.getInstance().getAccountCharacterCount(client.getAccountName()) >= Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT) && (Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT != 0)) { - if (Config.DEBUG) - { - _log.finer("Max number of characters reached. Creation failed."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_TOO_MANY_CHARACTERS)); return; } else if (CharNameTable.getInstance().doesCharNameExist(_name)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Message generated: You cannot create another character. Please delete the existing character and try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS)); return; } @@ -187,11 +167,6 @@ public final class CharacterCreate implements IClientIncomingPacket template = PlayerTemplateData.getInstance().getTemplate(_classId); if ((template == null) || (ClassId.getClassId(_classId).level() > 0)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: " + _name + " classId: " + _classId + " Template: " + template + " Message generated: Your character creation has failed."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -286,11 +261,6 @@ public final class CharacterCreate implements IClientIncomingPacket private void initNewChar(L2GameClient client, L2PcInstance newChar) { - if (Config.DEBUG) - { - _log.finer("Character init start"); - } - L2World.getInstance().storeObject(newChar); if (Config.STARTING_ADENA > 0) @@ -350,11 +320,6 @@ public final class CharacterCreate implements IClientIncomingPacket for (L2SkillLearn skill : SkillTreesData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true)) { - if (Config.DEBUG) - { - _log.finer("Adding starter skill:" + skill.getSkillId() + " / " + skill.getSkillLevel()); - } - newChar.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true); } @@ -372,10 +337,5 @@ public final class CharacterCreate implements IClientIncomingPacket final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.setCharSelection(cl.getCharInfo()); - - if (Config.DEBUG) - { - _log.finer("Character init end"); - } } } 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 bf1369b884..cd62eefdba 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 @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.enums.CharacterDeleteFailType; import com.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -55,11 +54,6 @@ public final class CharacterDelete implements IClientIncomingPacket // return; // } - if (Config.DEBUG) - { - _log.finer("deleting slot:" + _charSlot); - } - try { final CharacterDeleteFailType failType = client.markToDeleteChar(_charSlot); 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 9a3530ea8c..579b270fb4 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 @@ -145,12 +145,6 @@ public class CharacterSelect implements IClientIncomingPacket } } - // The L2PcInstance must be created here, so that it can be attached to the L2GameClient - if (Config.DEBUG) - { - _log.finer("selected slot:" + _charSlot); - } - // load up character from disk final L2PcInstance cha = client.loadCharFromDisk(_charSlot); if (cha == null) 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 e6938bda6d..9321940795 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 @@ -168,13 +168,10 @@ public class EnterWorld implements IClientIncomingPacket vars.remove("INSTANCE_RESTORE"); } - if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) - { - if (Config.DEBUG) - { - _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); - } - } + // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) + // { + // _log.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/RequestDropItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index f11a357d3e..04b62b31bf 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 @@ -149,20 +149,12 @@ public final class RequestDropItem implements IClientIncomingPacket if ((L2Item.TYPE2_QUEST == item.getItem().getType2()) && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ":player tried to drop quest item"); - } activeChar.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED_OR_EXCHANGED); return; } if (!activeChar.isInsideRadius(_x, _y, 0, 150, false, false) || (Math.abs(_z - activeChar.getZ()) > 50)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ": trying to drop too far away"); - } activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DISCARD_SOMETHING_THAT_FAR_AWAY_FROM_YOU); return; } @@ -173,11 +165,6 @@ public final class RequestDropItem implements IClientIncomingPacket return; } - if (Config.DEBUG) - { - _log.finer("requested drop item " + _objectId + "(" + item.getCount() + ") at " + _x + "/" + _y + "/" + _z); - } - if (item.isEquipped()) { activeChar.getInventory().unEquipItemInSlot(item.getLocationSlot()); @@ -187,11 +174,6 @@ public final class RequestDropItem implements IClientIncomingPacket final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); - if (Config.DEBUG) - { - _log.finer("dropping " + _objectId + " item(" + _count + ") at: " + _x + " " + _y + " " + _z); - } - // activeChar.broadcastUserInfo(); if (activeChar.isGM()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java index ee8bcd656b..c1d19b5e5b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData; @@ -193,11 +192,6 @@ public final class RequestDuelStart implements IClientIncomingPacket activeChar.onTransactionRequest(partyLeader); partyLeader.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.finer(activeChar.getName() + " requested a duel with " + partyLeader.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(partyLeader.getName()); activeChar.sendPacket(msg); @@ -222,11 +216,6 @@ public final class RequestDuelStart implements IClientIncomingPacket activeChar.onTransactionRequest(targetChar); targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.finer(activeChar.getName() + " requested a duel with " + targetChar.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(targetChar.getName()); activeChar.sendPacket(msg); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java index 2da3b56c0b..d92531c7f1 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.L2Clan; @@ -48,10 +47,6 @@ public final class RequestPledgeInfo implements IClientIncomingPacket final L2Clan clan = ClanTable.getInstance().getClan(_clanId); if (clan == null) { - if (Config.DEBUG) - { - _log.warning(getClass().getSimpleName() + ": Clan data for clanId " + _clanId + " is missing for player " + activeChar); - } return; // we have no clan data ?!? should not happen } 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 de928603c2..a1fdeb2cf3 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 @@ -67,11 +67,6 @@ public final class RequestRestart implements IClientIncomingPacket if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && Config.GM_RESTART_FIGHTING)) { - if (Config.DEBUG) - { - _log.finer("Player " + player.getName() + " tried to logout while fighting."); - } - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTART_WHILE_IN_COMBAT); client.sendPacket(RestartResponse.FALSE); return; 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 9ddb2d5222..281601ab37 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 @@ -99,11 +99,6 @@ public final class Say2 implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (Config.DEBUG) - { - _log.info("Say2: Msg Type = '" + _type + "' Text = '" + _text + "'."); - } - final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java index c4fad94c0e..c9d9242f10 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.TradeList; @@ -56,10 +55,6 @@ public final class TradeDone implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - if (Config.DEBUG) - { - _log.warning("player.getTradeList == null in " + getClass().getSimpleName() + " for player " + player.getName()); - } return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 5d7e35eb43..09c1d6ea32 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -195,10 +195,6 @@ public final class TradeRequest implements IClientIncomingPacket if (player.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.finer("Already trading with someone else."); - } client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE); return; } @@ -206,10 +202,6 @@ public final class TradeRequest implements IClientIncomingPacket SystemMessage sm; if (partner.isProcessingRequest() || partner.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.info("Transaction already in progress."); - } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); sm.addString(partner.getName()); client.sendPacket(sm); 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 602093c8ae..0a55aaab22 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 @@ -281,10 +281,6 @@ public final class UseItem implements IClientIncomingPacket { _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } - else if (Config.DEBUG) - { - _log.warning("No Item handler registered for Item Id: " + _itemId + "!"); - } } else if (handler.useItem(activeChar, item, _ctrlPressed)) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/MinionList.java index 22ba27c49f..eafbd496c3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/MinionList.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.util; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; @@ -35,8 +34,6 @@ import com.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private static final Logger _log = Logger.getLogger(MinionList.class.getName()); - protected final L2MonsterInstance _master; /** List containing the current spawned minions */ private final List _minionReferences = new CopyOnWriteArrayList<>(); @@ -385,11 +382,6 @@ public class MinionList minion.spawnMe(newX, newY, master.getZ()); - if (Config.DEBUG) - { - _log.info("Spawned minion template " + minion.getId() + " with objid: " + minion.getObjectId() + " to boss " + master.getObjectId() + " ,at: " + minion.getX() + " x, " + minion.getY() + " y, " + minion.getZ() + " z"); - } - return minion; } 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 22595d5182..d1e9b5d9b6 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 @@ -28,8 +28,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -import com.l2jmobius.Config; -import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.commons.util.network.BaseSendablePacket; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -125,11 +123,6 @@ public class GameServerThread extends Thread return; } - if (Config.DEBUG) - { - _log.warning("[C]" + Config.EOL + CommonUtil.printData(data)); - } - L2JGameServerPacketHandler.handlePacket(data, this); } } @@ -235,10 +228,6 @@ public class GameServerThread extends Thread { final byte[] data = sl.getContent(); NewCrypt.appendChecksum(data); - if (Config.DEBUG) - { - _log.finest("[S] " + sl.getClass().getSimpleName() + ":" + Config.EOL + CommonUtil.printData(data)); - } _blowfish.crypt(data, 0, data.length); final int len = data.length + 2; 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 b7865426f2..5adfc93535 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 @@ -223,11 +223,6 @@ public class LoginController { if (rset.next()) { - if (Config.DEBUG) - { - _log.finer("Account '" + login + "' exists."); - } - final AccountInfo info = new AccountInfo(rset.getString("login"), rset.getString("password"), rset.getInt("accessLevel"), rset.getInt("lastServer")); if (!info.checkPassHash(hashBase64)) { 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 da92f648a0..17599078af 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 @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.crypt.LoginCrypt; import com.l2jmobius.commons.util.crypt.ScrambledKeyPair; @@ -261,11 +260,6 @@ public final class L2LoginClient extends MMOClient> @Override public void onDisconnection() { - if (Config.DEBUG) - { - _log.info("DISCONNECTED: " + toString()); - } - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); 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 ee08b6fc80..9be997f496 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 @@ -22,7 +22,6 @@ import java.util.logging.Logger; import javax.crypto.Cipher; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; @@ -64,10 +63,6 @@ public class BlowFishKey extends BaseRecievePacket System.arraycopy(tempDecryptKey, i, key, 0, len - i); server.SetBlowFish(new NewCrypt(key)); - if (Config.DEBUG) - { - _log.info("New BlowFish key received, Blowfih Engine initialized:"); - } server.setLoginConnectionState(GameServerState.BF_CONNECTED); } catch (GeneralSecurityException 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 41571dfac2..4d8945a63d 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 @@ -78,19 +78,10 @@ public class GameServerAuth extends BaseRecievePacket _hosts[i] = readS(); } - if (Config.DEBUG) - { - _log.info("Auth request received"); - } - if (handleRegProcess()) { final AuthResponse ar = new AuthResponse(server.getGameServerInfo().getId()); server.sendPacket(ar); - if (Config.DEBUG) - { - _log.info("Authed: id: " + server.getGameServerInfo().getId()); - } server.setLoginConnectionState(GameServerState.AUTHED); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java index 9d365d85c1..3ce8993621 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.LoginController; @@ -30,8 +27,6 @@ import com.l2jmobius.loginserver.network.loginserverpackets.PlayerAuthResponse; */ public class PlayerAuthRequest extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerAuthRequest.class.getName()); - /** * @param decrypt * @param server @@ -47,28 +42,14 @@ public class PlayerAuthRequest extends BaseRecievePacket final SessionKey sessionKey = new SessionKey(loginKey1, loginKey2, playKey1, playKey2); PlayerAuthResponse authResponse; - if (Config.DEBUG) - { - _log.info("auth request received for Player " + account); - } final SessionKey key = LoginController.getInstance().getKeyForAccount(account); if ((key != null) && key.equals(sessionKey)) { - if (Config.DEBUG) - { - _log.info("auth request: OK"); - } LoginController.getInstance().removeAuthedLoginClient(account); authResponse = new PlayerAuthResponse(account, true); } else { - if (Config.DEBUG) - { - _log.info("auth request: NO"); - _log.info("session key from self: " + key); - _log.info("session key sent: " + sessionKey); - } authResponse = new PlayerAuthResponse(account, false); } server.sendPacket(authResponse); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java index b90ecefded..420e245412 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java @@ -16,11 +16,7 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; /** @@ -28,8 +24,6 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerInGame extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerInGame.class.getName()); - /** * @param decrypt * @param server @@ -42,10 +36,6 @@ public class PlayerInGame extends BaseRecievePacket { final String account = readS(); server.addAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Account " + account + " logged in GameServer: [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } } } } 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 272414ef91..51f1c8a96e 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 @@ -18,9 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; /** @@ -40,9 +38,5 @@ public class PlayerLogout extends BaseRecievePacket final String account = readS(); server.removeAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Player " + account + " logged out from gameserver [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } } } 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 5dd853031a..341c0a3a8c 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 @@ -18,7 +18,6 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.LoginController; @@ -43,9 +42,5 @@ public class PlayerTracert extends BaseRecievePacket final String hop4 = readS(); LoginController.getInstance().setAccountLastTracert(account, pcIp, hop1, hop2, hop3, hop4); - if (Config.DEBUG) - { - _log.info("Saved " + account + " last tracert"); - } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 9d2f783e0e..fb38653977 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -18,8 +18,6 @@ package com.l2jmobius.loginserver.network.serverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; - /** * Fromat: d d: response */ @@ -33,10 +31,6 @@ public final class GGAuth extends L2LoginServerPacket public GGAuth(int response) { _response = response; - if (Config.DEBUG) - { - _log.warning("Reason Hex: " + Integer.toHexString(response)); - } } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini index 43ce5a46e4..f14f090ade 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini @@ -688,13 +688,6 @@ AllowReportsFromSameClanMembers = False # Do not touch these if you do not know what you are doing. # These settings are for debugging servers ONLY. They are not meant for LIVE servers. -# Default: False -Debug = False - -# Instances debugging -# Default: False -InstanceDebug = False - # Html action cache debugging # Default: False HtmlActionCacheDebug = False diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index add0fc00ce..d34b4302c7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -20,7 +20,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.data.xml.impl.AdminData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -93,10 +92,6 @@ public final class AdminChangeAccessLevel implements IAdminCommandHandler catch (SQLException se) { activeChar.sendMessage("SQLException while changing character's access level"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } } 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 5352c38082..cb9623a88d 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 @@ -1217,10 +1217,6 @@ public class AdminEditChar implements IAdminCommandHandler sm.addInt(newReputation); player.sendPacket(sm); activeChar.sendMessage("Successfully Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ")."); - if (Config.DEBUG) - { - _log.finer("[SET KARMA] [GM]" + activeChar.getName() + " Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ")."); - } } private void editCharacter(L2PcInstance activeChar, String targetName) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index b6012bde39..33823c066e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.Arrays; import java.util.StringTokenizer; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.enums.Team; @@ -513,10 +512,6 @@ public class AdminEffects implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } } } else if (command.startsWith("admin_ave_abnormal")) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java index fdee3ec383..6f9c555c6f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java @@ -17,9 +17,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminExpSp implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminExpSp.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_add_exp_sp_to_character", @@ -150,10 +146,6 @@ public class AdminExpSp implements IAdminCommandHandler player.addExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + "."); - } } return true; } @@ -197,10 +189,6 @@ public class AdminExpSp implements IAdminCommandHandler player.removeExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + "."); - } } return true; } 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 67a0476e48..5acf20c5b6 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 @@ -122,10 +122,6 @@ public class AdminHeal implements IAdminCommandHandler { target.setCurrentCp(target.getMaxCp()); } - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") healed character " + target.getName()); - } } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index e0b48d8b99..1fff955404 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminInvul implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminInvul.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_invul", @@ -86,19 +82,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setIsInvul(false); text = activeChar.getName() + " is now mortal."; - if (Config.DEBUG) - { - _log.finer("GM: Gm removed invul mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setIsInvul(true); text = activeChar.getName() + " is now invulnerable."; - if (Config.DEBUG) - { - _log.finer("GM: Gm activated invul mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } @@ -110,19 +98,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setUndying(false); text = activeChar.getName() + " is now mortal."; - if (Config.DEBUG) - { - _log.finer("GM: Gm removed undying mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setUndying(true); text = activeChar.getName() + " is now undying."; - if (Config.DEBUG) - { - _log.finer("GM: Gm activated undying mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 1519831ed1..4a5209e59f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -17,7 +17,6 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -36,7 +35,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminKill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminKill.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_kill", @@ -154,10 +152,6 @@ public class AdminKill implements IAdminCommandHandler target.setIsInvul(true); } } - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") killed character " + target.getObjectId()); - } } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java index 4db018597d..5f2dffa9d6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; @@ -34,7 +31,6 @@ import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; */ public class AdminRes implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_res", @@ -123,11 +119,6 @@ public class AdminRes implements IAdminCommandHandler } doResurrect((L2Character) obj); - - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") resurrected character " + obj.getObjectId()); - } } private void handleNonPlayerRes(L2PcInstance activeChar) 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 8a51638dd2..ea51fdd106 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 @@ -21,7 +21,6 @@ import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; @@ -538,10 +537,6 @@ public class AdminSkill implements IAdminCommandHandler player.sendSkillList(); // Admin info. activeChar.sendMessage("You gave the skill " + name + " to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("[GM]" + activeChar.getName() + " gave skill " + name + " to " + player.getName() + "."); - } activeChar.sendSkillList(); } else @@ -573,10 +568,6 @@ public class AdminSkill implements IAdminCommandHandler player.removeSkill(skill); // Admin information activeChar.sendMessage("You removed the skill " + skillname + " from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("[GM]" + activeChar.getName() + " removed skill " + skillname + " from " + player.getName() + "."); - } activeChar.sendSkillList(); } else 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 7eda72c449..3f807d137a 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 @@ -23,7 +23,6 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.NpcData; @@ -135,10 +134,6 @@ public class AdminTeleport implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - _log.info("admin_walk: " + e); - } } } else if (command.startsWith("admin_move_to")) @@ -564,12 +559,6 @@ public class AdminTeleport implements IAdminCommandHandler spawn.init(); activeChar.sendMessage("Created " + template1.getName() + " on " + target.getObjectId() + "."); - - if (Config.DEBUG) - { - _log.finer("Spawn at X=" + spawn.getX() + " Y=" + spawn.getY() + " Z=" + spawn.getZ()); - _log.warning("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") moved NPC " + target.getObjectId()); - } } catch (Exception e) { 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 740b004b22..d6c31d5495 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 @@ -18,7 +18,6 @@ package handlers.bypasshandlers; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -85,11 +84,6 @@ public class PrivateWarehouse implements IBypassHandler } player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE)); - - if (Config.DEBUG) - { - _log.finer("Source: L2WarehouseInstance.java; Player: " + player.getName() + "; Command: showRetrieveWindow; Message: Showing stored items."); - } } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 0334844fe8..d195c3e64a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -17,7 +17,6 @@ package handlers.chathandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.ChatType; @@ -38,8 +37,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class ChatGeneral implements IChatHandler { - private static Logger _log = Logger.getLogger(ChatGeneral.class.getName()); - private static final ChatType[] CHAT_TYPES = { ChatType.GENERAL, @@ -63,10 +60,6 @@ public final class ChatGeneral implements IChatHandler else { command = text.substring(1); - if (Config.DEBUG) - { - _log.info("Command: " + command); - } } vch = VoicedCommandHandler.getInstance().getHandler(command); if (vch != null) @@ -76,10 +69,6 @@ public final class ChatGeneral implements IChatHandler } else { - if (Config.DEBUG) - { - _log.warning("No handler registered for bypass '" + command + "'"); - } vcd_used = false; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini b/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini index 04bb765318..fe9cc1f9de 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/config/LoginServer.ini @@ -125,11 +125,3 @@ LoginRestartSchedule = False # Time in hours. # Default: 24 LoginRestartTime = 24 - - -# --------------------------------------------------------------------------- -# Developer Settings -# --------------------------------------------------------------------------- - -# Default: False -Debug = False diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java index af085c3219..970681c004 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java @@ -419,8 +419,6 @@ public final class Config public static boolean SKILL_CHECK_ENABLE; public static boolean SKILL_CHECK_REMOVE; public static boolean SKILL_CHECK_GM; - public static boolean DEBUG; - public static boolean DEBUG_INSTANCES; public static boolean HTML_ACTION_CACHE_DEBUG; public static boolean PACKET_HANDLER_DEBUG; public static boolean DEVELOPER; @@ -1830,8 +1828,6 @@ public final class Config SKILL_CHECK_ENABLE = General.getBoolean("SkillCheckEnable", false); SKILL_CHECK_REMOVE = General.getBoolean("SkillCheckRemove", false); SKILL_CHECK_GM = General.getBoolean("SkillCheckGM", true); - DEBUG = General.getBoolean("Debug", false); - DEBUG_INSTANCES = General.getBoolean("InstanceDebug", false); HTML_ACTION_CACHE_DEBUG = General.getBoolean("HtmlActionCacheDebug", false); PACKET_HANDLER_DEBUG = General.getBoolean("PacketHandlerDebug", false); DEVELOPER = General.getBoolean("Developer", false); @@ -2900,8 +2896,6 @@ public final class Config DATAPACK_ROOT = new File("."); } - DEBUG = ServerSettings.getBoolean("Debug", false); - ACCEPT_NEW_GAMESERVER = ServerSettings.getBoolean("AcceptNewGameServer", true); LOGIN_TRY_BEFORE_BAN = ServerSettings.getInt("LoginTryBeforeBan", 5); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java index fc1fd57c3e..ee076bff4b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java @@ -23,7 +23,6 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.IGameXmlReader; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -42,6 +41,7 @@ public final class HitConditionBonusData implements IGameXmlReader private int highBonus = 0; private int lowBonus = 0; private int darkBonus = 0; + @SuppressWarnings("unused") private int rainBonus = 0; /** @@ -57,16 +57,6 @@ public final class HitConditionBonusData implements IGameXmlReader { parseDatapackFile("data/stats/hitConditionBonus.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded Hit Condition bonuses."); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Front bonus: " + frontBonus); - LOGGER.info(getClass().getSimpleName() + ": Side bonus: " + sideBonus); - LOGGER.info(getClass().getSimpleName() + ": Back bonus: " + backBonus); - LOGGER.info(getClass().getSimpleName() + ": High bonus: " + highBonus); - LOGGER.info(getClass().getSimpleName() + ": Low bonus: " + lowBonus); - LOGGER.info(getClass().getSimpleName() + ": Dark bonus: " + darkBonus); - LOGGER.info(getClass().getSimpleName() + ": Rain bonus: " + rainBonus); - } } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/datatables/AugmentationData.java index 8582c38326..23b5e67b43 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/datatables/AugmentationData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/datatables/AugmentationData.java @@ -914,10 +914,6 @@ public class AugmentationData } stat12 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; resultColor=" + resultColor + "; level=" + lifeStoneLevel + "; grade=" + lifeStoneGrade); - } return new Augmentation(((stat34 << 16) + stat12)); } @@ -1047,10 +1043,6 @@ public class AugmentationData // stat12 has stats only stat12 = base + skillsLength + (ACC_STAT_SUBBLOCKSIZE * resultColor) + stat12; - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Accessory augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; level=" + lifeStoneLevel); - } final int augmentationId = ((stat34 << 16) + stat12); return getAugmentation(augmentationId); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/datatables/ItemTable.java index 8e700cdd85..4f74f2b04c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/datatables/ItemTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/datatables/ItemTable.java @@ -234,11 +234,6 @@ public class ItemTable } } - if (Config.DEBUG) - { - LOGGER.finer(getClass().getSimpleName() + ": Item created: " + item); - } - // Add the L2ItemInstance object to _allObjects of L2world L2World.getInstance().storeObject(item); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 0b8070e37b..d2b606a72a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -108,12 +108,6 @@ public final class CastleManorManager implements IGameXmlReader, IStorable { ThreadPoolManager.scheduleAtFixedRate(this::storeMe, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000); } - - // Send debug message - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode); - } } else { @@ -435,10 +429,6 @@ public final class CastleManorManager implements IGameXmlReader, IStorable } } scheduleModeChange(); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Manor mode changed to " + _mode + "!"); - } } public final void setNextSeedProduction(List list, int castleId) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index c776c03a97..3149d5ff45 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -448,10 +448,6 @@ public final class InstanceManager implements IGameXmlReader { if (_currentInstanceId == Integer.MAX_VALUE) { - if (Config.DEBUG_INSTANCES) - { - LOGGER.info(getClass().getSimpleName() + ": Instance id owerflow, starting from zero."); - } _currentInstanceId = 0; } _currentInstanceId++; 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 0f821abc37..86a1a80e9b 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 @@ -472,11 +472,6 @@ public class CursedWeapon implements INamable public void saveData() { - if (Config.DEBUG) - { - _log.info("CursedWeapon: Saving data to disk."); - } - try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM cursed_weapons WHERE itemId = ?"); PreparedStatement ps = con.prepareStatement("INSERT INTO cursed_weapons (itemId, charId, playerReputation, playerPkKills, nbKills, endTime) VALUES (?, ?, ?, ?, ?, ?)")) 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 9912e7d8e3..77faa268ca 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 @@ -988,10 +988,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(9, getNewLeaderId()); ps.setInt(10, getId()); ps.execute(); - if (Config.DEBUG) - { - _log.finer("New clan leader saved in db: " + getId()); - } } catch (Exception e) { @@ -1033,10 +1029,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(12, getAllyCrestId()); ps.setInt(13, getNewLeaderId()); ps.execute(); - if (Config.DEBUG) - { - _log.finer("New clan saved in db: " + getId()); - } } catch (Exception e) { @@ -1061,10 +1053,6 @@ public class L2Clan implements IIdentifiable, INamable ps1.setLong(3, clanCreateExpiryTime); ps1.setInt(4, member.getObjectId()); ps1.execute(); - if (Config.DEBUG) - { - _log.finer("clan member removed in db: " + getId()); - } // Remove apprentice. ps2.setInt(1, member.getObjectId()); ps2.execute(); @@ -1142,11 +1130,6 @@ public class L2Clan implements IIdentifiable, INamable } } - if (Config.DEBUG && (getName() != null)) - { - _log.info("Restored clan data for \"" + getName() + "\" from database."); - } - restoreSubPledges(); restoreRankPrivs(); restoreSkills(); @@ -1910,11 +1893,6 @@ public class L2Clan implements IIdentifiable, INamable // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } - - if (Config.DEBUG) - { - _log.finer("New sub_clan saved in db: " + getId() + "; " + pledgeType); - } } catch (Exception e) { @@ -1980,10 +1958,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(3, getId()); ps.setInt(4, pledgeType); ps.execute(); - if (Config.DEBUG) - { - _log.finer("Subpledge updated in db: " + getId()); - } } catch (Exception e) { @@ -2428,11 +2402,6 @@ public class L2Clan implements IIdentifiable, INamable return; } - if (Config.DEBUG) - { - _log.finer(player.getObjectId() + "(" + player.getName() + ") requested ally creation from "); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); 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 55ebf4f5c1..f9aa07f44d 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 @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -104,10 +103,6 @@ public class L2DefenderInstance extends L2Attackable } if (!isInsideRadius(getSpawn(), 40, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); @@ -147,11 +142,6 @@ public class L2DefenderInstance extends L2Attackable // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - _log.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java index 4f7386ef47..b982a00c9f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; @@ -99,10 +98,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance { if (!isInsideRadius(getSpawn(), 200, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java index fc636123fb..a7ec0202ed 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -442,10 +442,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -493,10 +489,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -544,10 +536,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Exp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -719,10 +707,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Tele editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -770,10 +754,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Support editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 6a94be63b5..214c883f17 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; */ public class L2GuardInstance extends L2Attackable { - private static Logger _log = Logger.getLogger(L2GuardInstance.class.getName()); - /** * Constructor of L2GuardInstance (use L2Character and L2NpcInstance constructor).
* Actions : @@ -172,11 +168,6 @@ public class L2GuardInstance extends L2Attackable // Check if the L2PcInstance is in the _aggroList of the L2GuardInstance if (containsTarget(player)) { - if (Config.DEBUG) - { - _log.finer(player.getObjectId() + ": Attacked guard " + getObjectId()); - } - // Set the L2PcInstance Intention to AI_INTENTION_ATTACK player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index 11f2e21933..ed9aab530f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; import java.util.Map; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.model.L2SkillLearn; @@ -61,11 +60,6 @@ public class L2NpcInstance extends L2Npc */ public static void showSkillList(L2PcInstance player, L2Npc npc, ClassId classId) { - if (Config.DEBUG) - { - _log.finer("SkillList activated on: " + npc.getObjectId()); - } - final int npcId = npc.getTemplate().getId(); if (npcId == 32611) // Tolonis (Officer) { 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 06edf6f425..dfdc1d6ea6 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 @@ -3878,20 +3878,11 @@ public final class L2PcInstance extends L2Playable final L2Summon pet = getPet(); if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return null; } if (isProcessingItem(objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return null; } @@ -10574,20 +10565,11 @@ public final class L2PcInstance extends L2Playable final L2Summon pet = getPet(); if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return false; } if (isProcessingItem(objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return false; } 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 9494559d7d..9af40f494e 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 @@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -207,11 +206,6 @@ public class CharStatus { if ((_regTask == null) && !getActiveChar().isDead()) { - if (Config.DEBUG) - { - _log.finer("HP/MP regen started"); - } - // Get the Regeneration period final int period = Formulas.getRegeneratePeriod(getActiveChar()); @@ -232,11 +226,6 @@ public class CharStatus { if (_regTask != null) { - if (Config.DEBUG) - { - _log.finer("HP/MP regen stop"); - } - // Stop the HP/MP/CP Regeneration task _regTask.cancel(false); _regTask = null; 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 d38ef03cf0..fc216cf183 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 @@ -24,7 +24,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.NpcData; @@ -307,11 +306,6 @@ public final class BlockCheckerEngine _abnormalEnd = true; ThreadPoolManager.execute(new EndEvent()); - - if (Config.DEBUG) - { - _log.info("Handys Block Checker Event at arena " + _arena + " ended due lack of players!"); - } } } catch (Exception e) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index 232944b028..77c2468437 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -128,12 +128,6 @@ public final class Instance implements IIdentifiable, INamable // Notify DP scripts EventDispatcher.getInstance().notifyEventAsync(new OnInstanceCreated(this, player), _template); } - - // Debug logger - if (Config.DEBUG_INSTANCES) - { - LOGGER.info("Instance " + _template.getName() + " (" + _template.getId() + ") has been created with instance id " + getId()); - } } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e587d83d0f..58876d1b60 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1327,11 +1327,6 @@ public abstract class Inventory extends ItemContainer */ public L2ItemInstance unEquipItemInBodySlot(int slot) { - if (Config.DEBUG) - { - LOGGER.info("Unequip body slot: " + slot); - } - int pdollSlot = -1; switch (slot) 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 8c4ba4eb64..8e4641502a 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 @@ -264,10 +264,6 @@ public final class Skill implements IIdentifiable if (Config.ENABLE_MODIFY_SKILL_REUSE && Config.SKILL_REUSE_LIST.containsKey(_id)) { - if (Config.DEBUG) - { - _log.info("*** Skill " + _name + " (" + _level + ") changed reuse from " + set.getInt("reuseDelay", 0) + " to " + Config.SKILL_REUSE_LIST.get(_id) + " seconds."); - } _reuseDelay = Config.SKILL_REUSE_LIST.get(_id); } else 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 629b0afc09..38baefc4e1 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 @@ -170,10 +170,6 @@ public final class L2GameClient extends ChannelInboundHandler @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - if (Config.DEBUG) - { - LOGGER.log(Level.WARNING, "Network exception caught for: " + toString(), cause); - } } public Channel getChannel() 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 ccd2d1d13a..f92d2c5e23 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 @@ -32,8 +32,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; public final class Action implements IClientIncomingPacket { private int _objectId; + @SuppressWarnings("unused") private int _originX; + @SuppressWarnings("unused") private int _originY; + @SuppressWarnings("unused") private int _originZ; private int _actionId; @@ -51,11 +54,6 @@ public final class Action implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (Config.DEBUG) - { - _log.info(getClass().getSimpleName() + ": " + (_actionId == 0 ? "Simple-click" : "Shift-click") + " Target object ID: " + _objectId + " orignX: " + _originX + " orignY: " + _originY + " orignZ: " + _originZ); - } - // Get the current L2PcInstance of the player final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 8890047012..22dfca0017 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.LoginServerThread; import com.l2jmobius.gameserver.LoginServerThread.SessionKey; @@ -60,11 +59,6 @@ public final class AuthLogin implements IClientIncomingPacket } final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2); - if (Config.DEBUG) - { - _log.info("user:" + _loginName); - _log.info("key:" + key); - } // avoid potential exploits if (client.getAccountName() == null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 7f9cb857c7..f202f197b2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.model.Location; @@ -53,10 +52,6 @@ public final class CannotMoveAnymore implements IClientIncomingPacket return; } - if (Config.DEBUG) - { - _log.finer("client: x:" + _x + " y:" + _y + " z:" + _z + " server x:" + player.getX() + " y:" + player.getY() + " z:" + player.getZ()); - } if (player.getAI() != null) { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); 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 06464d9911..f530aead0c 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 @@ -92,11 +92,6 @@ public final class CharacterCreate implements IClientIncomingPacket // Last Verified: May 30, 2009 - Gracia Final - Players are able to create characters with names consisting of as little as 1,2,3 letter/number combinations. if ((_name.length() < 1) || (_name.length() > 16)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Your title cannot exceed 16 characters in length. Please try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS)); return; } @@ -122,11 +117,6 @@ public final class CharacterCreate implements IClientIncomingPacket // Last Verified: May 30, 2009 - Gracia Final if (!Util.isAlphaNumeric(_name) || !isValidName(_name)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Incorrect name. Please try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_INCORRECT_NAME)); return; } @@ -165,21 +155,11 @@ public final class CharacterCreate implements IClientIncomingPacket { if ((CharNameTable.getInstance().getAccountCharacterCount(client.getAccountName()) >= Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT) && (Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT != 0)) { - if (Config.DEBUG) - { - _log.finer("Max number of characters reached. Creation failed."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_TOO_MANY_CHARACTERS)); return; } else if (CharNameTable.getInstance().doesCharNameExist(_name)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Message generated: You cannot create another character. Please delete the existing character and try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS)); return; } @@ -187,11 +167,6 @@ public final class CharacterCreate implements IClientIncomingPacket template = PlayerTemplateData.getInstance().getTemplate(_classId); if ((template == null) || (ClassId.getClassId(_classId).level() > 0)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: " + _name + " classId: " + _classId + " Template: " + template + " Message generated: Your character creation has failed."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -286,11 +261,6 @@ public final class CharacterCreate implements IClientIncomingPacket private void initNewChar(L2GameClient client, L2PcInstance newChar) { - if (Config.DEBUG) - { - _log.finer("Character init start"); - } - L2World.getInstance().storeObject(newChar); if (Config.STARTING_ADENA > 0) @@ -350,11 +320,6 @@ public final class CharacterCreate implements IClientIncomingPacket for (L2SkillLearn skill : SkillTreesData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true)) { - if (Config.DEBUG) - { - _log.finer("Adding starter skill:" + skill.getSkillId() + " / " + skill.getSkillLevel()); - } - newChar.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true); } @@ -372,10 +337,5 @@ public final class CharacterCreate implements IClientIncomingPacket final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.setCharSelection(cl.getCharInfo()); - - if (Config.DEBUG) - { - _log.finer("Character init end"); - } } } 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 bf1369b884..cd62eefdba 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 @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.enums.CharacterDeleteFailType; import com.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -55,11 +54,6 @@ public final class CharacterDelete implements IClientIncomingPacket // return; // } - if (Config.DEBUG) - { - _log.finer("deleting slot:" + _charSlot); - } - try { final CharacterDeleteFailType failType = client.markToDeleteChar(_charSlot); 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 9a3530ea8c..579b270fb4 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 @@ -145,12 +145,6 @@ public class CharacterSelect implements IClientIncomingPacket } } - // The L2PcInstance must be created here, so that it can be attached to the L2GameClient - if (Config.DEBUG) - { - _log.finer("selected slot:" + _charSlot); - } - // load up character from disk final L2PcInstance cha = client.loadCharFromDisk(_charSlot); if (cha == null) 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 7b9d24c501..b2438a0cf4 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 @@ -168,13 +168,10 @@ public class EnterWorld implements IClientIncomingPacket vars.remove("INSTANCE_RESTORE"); } - if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) - { - if (Config.DEBUG) - { - _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); - } - } + // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) + // { + // _log.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/RequestDropItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index f11a357d3e..04b62b31bf 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 @@ -149,20 +149,12 @@ public final class RequestDropItem implements IClientIncomingPacket if ((L2Item.TYPE2_QUEST == item.getItem().getType2()) && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ":player tried to drop quest item"); - } activeChar.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED_OR_EXCHANGED); return; } if (!activeChar.isInsideRadius(_x, _y, 0, 150, false, false) || (Math.abs(_z - activeChar.getZ()) > 50)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ": trying to drop too far away"); - } activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DISCARD_SOMETHING_THAT_FAR_AWAY_FROM_YOU); return; } @@ -173,11 +165,6 @@ public final class RequestDropItem implements IClientIncomingPacket return; } - if (Config.DEBUG) - { - _log.finer("requested drop item " + _objectId + "(" + item.getCount() + ") at " + _x + "/" + _y + "/" + _z); - } - if (item.isEquipped()) { activeChar.getInventory().unEquipItemInSlot(item.getLocationSlot()); @@ -187,11 +174,6 @@ public final class RequestDropItem implements IClientIncomingPacket final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); - if (Config.DEBUG) - { - _log.finer("dropping " + _objectId + " item(" + _count + ") at: " + _x + " " + _y + " " + _z); - } - // activeChar.broadcastUserInfo(); if (activeChar.isGM()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java index ee8bcd656b..c1d19b5e5b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData; @@ -193,11 +192,6 @@ public final class RequestDuelStart implements IClientIncomingPacket activeChar.onTransactionRequest(partyLeader); partyLeader.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.finer(activeChar.getName() + " requested a duel with " + partyLeader.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(partyLeader.getName()); activeChar.sendPacket(msg); @@ -222,11 +216,6 @@ public final class RequestDuelStart implements IClientIncomingPacket activeChar.onTransactionRequest(targetChar); targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.finer(activeChar.getName() + " requested a duel with " + targetChar.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(targetChar.getName()); activeChar.sendPacket(msg); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java index 2da3b56c0b..d92531c7f1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.L2Clan; @@ -48,10 +47,6 @@ public final class RequestPledgeInfo implements IClientIncomingPacket final L2Clan clan = ClanTable.getInstance().getClan(_clanId); if (clan == null) { - if (Config.DEBUG) - { - _log.warning(getClass().getSimpleName() + ": Clan data for clanId " + _clanId + " is missing for player " + activeChar); - } return; // we have no clan data ?!? should not happen } 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 de928603c2..a1fdeb2cf3 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 @@ -67,11 +67,6 @@ public final class RequestRestart implements IClientIncomingPacket if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && Config.GM_RESTART_FIGHTING)) { - if (Config.DEBUG) - { - _log.finer("Player " + player.getName() + " tried to logout while fighting."); - } - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTART_WHILE_IN_COMBAT); client.sendPacket(RestartResponse.FALSE); return; 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 9ddb2d5222..281601ab37 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 @@ -99,11 +99,6 @@ public final class Say2 implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (Config.DEBUG) - { - _log.info("Say2: Msg Type = '" + _type + "' Text = '" + _text + "'."); - } - final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java index c4fad94c0e..c9d9242f10 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.TradeList; @@ -56,10 +55,6 @@ public final class TradeDone implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - if (Config.DEBUG) - { - _log.warning("player.getTradeList == null in " + getClass().getSimpleName() + " for player " + player.getName()); - } return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 5d7e35eb43..09c1d6ea32 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -195,10 +195,6 @@ public final class TradeRequest implements IClientIncomingPacket if (player.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.finer("Already trading with someone else."); - } client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE); return; } @@ -206,10 +202,6 @@ public final class TradeRequest implements IClientIncomingPacket SystemMessage sm; if (partner.isProcessingRequest() || partner.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.info("Transaction already in progress."); - } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); sm.addString(partner.getName()); client.sendPacket(sm); 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 602093c8ae..0a55aaab22 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 @@ -281,10 +281,6 @@ public final class UseItem implements IClientIncomingPacket { _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } - else if (Config.DEBUG) - { - _log.warning("No Item handler registered for Item Id: " + _itemId + "!"); - } } else if (handler.useItem(activeChar, item, _ctrlPressed)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/MinionList.java index 22ba27c49f..eafbd496c3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/MinionList.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.util; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; @@ -35,8 +34,6 @@ import com.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private static final Logger _log = Logger.getLogger(MinionList.class.getName()); - protected final L2MonsterInstance _master; /** List containing the current spawned minions */ private final List _minionReferences = new CopyOnWriteArrayList<>(); @@ -385,11 +382,6 @@ public class MinionList minion.spawnMe(newX, newY, master.getZ()); - if (Config.DEBUG) - { - _log.info("Spawned minion template " + minion.getId() + " with objid: " + minion.getObjectId() + " to boss " + master.getObjectId() + " ,at: " + minion.getX() + " x, " + minion.getY() + " y, " + minion.getZ() + " z"); - } - return minion; } 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 22595d5182..d1e9b5d9b6 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 @@ -28,8 +28,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -import com.l2jmobius.Config; -import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.commons.util.network.BaseSendablePacket; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -125,11 +123,6 @@ public class GameServerThread extends Thread return; } - if (Config.DEBUG) - { - _log.warning("[C]" + Config.EOL + CommonUtil.printData(data)); - } - L2JGameServerPacketHandler.handlePacket(data, this); } } @@ -235,10 +228,6 @@ public class GameServerThread extends Thread { final byte[] data = sl.getContent(); NewCrypt.appendChecksum(data); - if (Config.DEBUG) - { - _log.finest("[S] " + sl.getClass().getSimpleName() + ":" + Config.EOL + CommonUtil.printData(data)); - } _blowfish.crypt(data, 0, data.length); final int len = data.length + 2; 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 b7865426f2..5adfc93535 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 @@ -223,11 +223,6 @@ public class LoginController { if (rset.next()) { - if (Config.DEBUG) - { - _log.finer("Account '" + login + "' exists."); - } - final AccountInfo info = new AccountInfo(rset.getString("login"), rset.getString("password"), rset.getInt("accessLevel"), rset.getInt("lastServer")); if (!info.checkPassHash(hashBase64)) { 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 da92f648a0..17599078af 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 @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.crypt.LoginCrypt; import com.l2jmobius.commons.util.crypt.ScrambledKeyPair; @@ -261,11 +260,6 @@ public final class L2LoginClient extends MMOClient> @Override public void onDisconnection() { - if (Config.DEBUG) - { - _log.info("DISCONNECTED: " + toString()); - } - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); 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 ee08b6fc80..9be997f496 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 @@ -22,7 +22,6 @@ import java.util.logging.Logger; import javax.crypto.Cipher; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; @@ -64,10 +63,6 @@ public class BlowFishKey extends BaseRecievePacket System.arraycopy(tempDecryptKey, i, key, 0, len - i); server.SetBlowFish(new NewCrypt(key)); - if (Config.DEBUG) - { - _log.info("New BlowFish key received, Blowfih Engine initialized:"); - } server.setLoginConnectionState(GameServerState.BF_CONNECTED); } catch (GeneralSecurityException 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 41571dfac2..4d8945a63d 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 @@ -78,19 +78,10 @@ public class GameServerAuth extends BaseRecievePacket _hosts[i] = readS(); } - if (Config.DEBUG) - { - _log.info("Auth request received"); - } - if (handleRegProcess()) { final AuthResponse ar = new AuthResponse(server.getGameServerInfo().getId()); server.sendPacket(ar); - if (Config.DEBUG) - { - _log.info("Authed: id: " + server.getGameServerInfo().getId()); - } server.setLoginConnectionState(GameServerState.AUTHED); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java index 9d365d85c1..3ce8993621 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.LoginController; @@ -30,8 +27,6 @@ import com.l2jmobius.loginserver.network.loginserverpackets.PlayerAuthResponse; */ public class PlayerAuthRequest extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerAuthRequest.class.getName()); - /** * @param decrypt * @param server @@ -47,28 +42,14 @@ public class PlayerAuthRequest extends BaseRecievePacket final SessionKey sessionKey = new SessionKey(loginKey1, loginKey2, playKey1, playKey2); PlayerAuthResponse authResponse; - if (Config.DEBUG) - { - _log.info("auth request received for Player " + account); - } final SessionKey key = LoginController.getInstance().getKeyForAccount(account); if ((key != null) && key.equals(sessionKey)) { - if (Config.DEBUG) - { - _log.info("auth request: OK"); - } LoginController.getInstance().removeAuthedLoginClient(account); authResponse = new PlayerAuthResponse(account, true); } else { - if (Config.DEBUG) - { - _log.info("auth request: NO"); - _log.info("session key from self: " + key); - _log.info("session key sent: " + sessionKey); - } authResponse = new PlayerAuthResponse(account, false); } server.sendPacket(authResponse); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java index b90ecefded..420e245412 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java @@ -16,11 +16,7 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; /** @@ -28,8 +24,6 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerInGame extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerInGame.class.getName()); - /** * @param decrypt * @param server @@ -42,10 +36,6 @@ public class PlayerInGame extends BaseRecievePacket { final String account = readS(); server.addAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Account " + account + " logged in GameServer: [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } } } } 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 272414ef91..51f1c8a96e 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 @@ -18,9 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; /** @@ -40,9 +38,5 @@ public class PlayerLogout extends BaseRecievePacket final String account = readS(); server.removeAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Player " + account + " logged out from gameserver [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } } } 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 5dd853031a..341c0a3a8c 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 @@ -18,7 +18,6 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.LoginController; @@ -43,9 +42,5 @@ public class PlayerTracert extends BaseRecievePacket final String hop4 = readS(); LoginController.getInstance().setAccountLastTracert(account, pcIp, hop1, hop2, hop3, hop4); - if (Config.DEBUG) - { - _log.info("Saved " + account + " last tracert"); - } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 9d2f783e0e..fb38653977 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -18,8 +18,6 @@ package com.l2jmobius.loginserver.network.serverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; - /** * Fromat: d d: response */ @@ -33,10 +31,6 @@ public final class GGAuth extends L2LoginServerPacket public GGAuth(int response) { _response = response; - if (Config.DEBUG) - { - _log.warning("Reason Hex: " + Integer.toHexString(response)); - } } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini index 3f43909b18..b310b41bcb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini @@ -869,13 +869,6 @@ AllowReportsFromSameClanMembers = False # Do not touch these if you do not know what you are doing. # These settings are for debugging servers ONLY. They are not meant for LIVE servers. -# Default: False -Debug = False - -# Instances debugging -# Default: False -InstanceDebug = False - # Html action cache debugging # Default: False HtmlActionCacheDebug = False diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index fecaef417c..d24eb1e555 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -20,7 +20,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.data.xml.impl.AdminData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -93,10 +92,6 @@ public final class AdminChangeAccessLevel implements IAdminCommandHandler catch (SQLException se) { activeChar.sendMessage("SQLException while changing character's access level"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } } 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 e5f4aa140a..b2949c8334 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 @@ -1072,19 +1072,11 @@ public class AdminEditChar implements IAdminCommandHandler player.sendPacket(sm); // Admin information activeChar.sendMessage("Successfully Changed karma for " + player.getName() + " from (" + oldKarma + ") to (" + newKarma + ")."); - if (Config.DEBUG) - { - _log.fine("[SET KARMA] [GM]" + activeChar.getName() + " Changed karma for " + player.getName() + " from (" + oldKarma + ") to (" + newKarma + ")."); - } } else { // tell admin of mistake activeChar.sendMessage("You must enter a value for karma greater than or equal to 0."); - if (Config.DEBUG) - { - _log.fine("[SET KARMA] ERROR: [GM]" + activeChar.getName() + " entered an incorrect value for new karma: " + newKarma + " for " + player.getName() + "."); - } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index a9e472d46b..2bd233a60c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.Collection; import java.util.StringTokenizer; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.Team; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -530,10 +529,6 @@ public class AdminEffects implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } } } else if (command.startsWith("admin_ave_abnormal") || command.startsWith("admin_ave_special") || command.startsWith("admin_ave_event")) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java index 8a37933be5..81475ee36d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java @@ -17,9 +17,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminExpSp implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminExpSp.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_add_exp_sp_to_character", @@ -150,10 +146,6 @@ public class AdminExpSp implements IAdminCommandHandler player.addExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + "."); - } } return true; } @@ -197,10 +189,6 @@ public class AdminExpSp implements IAdminCommandHandler player.removeExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + "."); - } } 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 ced532f37c..d536811081 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 @@ -127,10 +127,6 @@ public class AdminHeal implements IAdminCommandHandler { target.setCurrentCp(target.getMaxCp()); } - if (Config.DEBUG) - { - _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") healed character " + target.getName()); - } } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index b07e8adf4c..2ecbd11226 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -29,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminInvul implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminInvul.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_invul", @@ -69,19 +65,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setIsInvul(false); text = activeChar.getName() + " is now mortal"; - if (Config.DEBUG) - { - _log.fine("GM: Gm removed invul mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setIsInvul(true); text = activeChar.getName() + " is now invulnerable"; - if (Config.DEBUG) - { - _log.fine("GM: Gm activated invul mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index be5d890164..d827d13efe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -17,7 +17,6 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -35,7 +34,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminKill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminKill.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_kill", @@ -153,10 +151,6 @@ public class AdminKill implements IAdminCommandHandler target.setIsInvul(true); } } - if (Config.DEBUG) - { - _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") killed character " + target.getObjectId()); - } } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java index 5caaab572a..027fbd9c1b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; @@ -34,7 +31,6 @@ import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; */ public class AdminRes implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_res", @@ -123,11 +119,6 @@ public class AdminRes implements IAdminCommandHandler } doResurrect((L2Character) obj); - - if (Config.DEBUG) - { - _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") resurrected character " + obj.getObjectId()); - } } private void handleNonPlayerRes(L2PcInstance activeChar) 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 e5dbb9d6fa..90578fea82 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 @@ -21,7 +21,6 @@ import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.datatables.SkillData; @@ -472,10 +471,6 @@ public class AdminSkill implements IAdminCommandHandler player.sendSkillList(); // Admin info. activeChar.sendMessage("You gave the skill " + name + " to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.fine("[GM]" + activeChar.getName() + " gave skill " + name + " to " + player.getName() + "."); - } activeChar.sendSkillList(); } else @@ -507,10 +502,6 @@ public class AdminSkill implements IAdminCommandHandler player.removeSkill(skill); // Admin information activeChar.sendMessage("You removed the skill " + skillname + " from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.fine("[GM]" + activeChar.getName() + " removed skill " + skillname + " from " + player.getName() + "."); - } activeChar.sendSkillList(); } else 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 4741ce8ae6..9c0c1c4740 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 @@ -128,10 +128,6 @@ public class AdminTeleport implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - _log.info("admin_walk: " + e); - } } } else if (command.startsWith("admin_move_to")) @@ -571,12 +567,6 @@ public class AdminTeleport implements IAdminCommandHandler spawn.init(); activeChar.sendMessage("Created " + target.getTemplate().getName() + " on " + target.getObjectId() + "."); - - if (Config.DEBUG) - { - _log.fine("Spawn at X=" + spawn.getX() + " Y=" + spawn.getY() + " Z=" + spawn.getZ()); - _log.warning("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") moved NPC " + target.getObjectId()); - } } catch (Exception e) { 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 e93d16cd8b..fd98bbe512 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 @@ -109,12 +109,6 @@ public class ClanWarehouse implements IBypassHandler activeChar.sendPacket(ActionFailed.STATIC_PACKET); activeChar.setActiveWarehouse(activeChar.getClan().getWarehouse()); activeChar.setInventoryBlockingStatus(true); - - if (Config.DEBUG) - { - _log.fine("Source: L2WarehouseInstance.java; Player: " + activeChar.getName() + "; Command: showDepositWindowClan; Message: Showing items to deposit."); - } - activeChar.sendPacket(new WareHouseDepositList(activeChar, WareHouseDepositList.CLAN)); return true; } @@ -161,11 +155,6 @@ public class ClanWarehouse implements IBypassHandler { player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.CLAN)); } - - if (Config.DEBUG) - { - _log.fine("Source: L2WarehouseInstance.java; Player: " + player.getName() + "; Command: showRetrieveWindowClan; Message: Showing stored items."); - } } @Override 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 a1713efa1e..cb9a86ff9f 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 @@ -125,11 +125,6 @@ public class PrivateWarehouse implements IBypassHandler { player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE)); } - - if (Config.DEBUG) - { - _log.fine("Source: L2WarehouseInstance.java; Player: " + player.getName() + "; Command: showRetrieveWindow; Message: Showing stored items."); - } } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index a472607c5f..02a2bf0de0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -17,7 +17,6 @@ package handlers.chathandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.ChatType; @@ -36,8 +35,6 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay; */ public final class ChatGeneral implements IChatHandler { - private static Logger _log = Logger.getLogger(ChatGeneral.class.getName()); - private static final ChatType[] CHAT_TYPES = { ChatType.GENERAL, @@ -61,10 +58,6 @@ public final class ChatGeneral implements IChatHandler else { command = text.substring(1); - if (Config.DEBUG) - { - _log.info("Command: " + command); - } } vch = VoicedCommandHandler.getInstance().getHandler(command); if (vch != null) @@ -74,10 +67,6 @@ public final class ChatGeneral implements IChatHandler } else { - if (Config.DEBUG) - { - _log.warning("No handler registered for bypass '" + command + "'"); - } vcd_used = false; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java index 1025a51319..f6a5119532 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java @@ -21,7 +21,6 @@ import java.net.Socket; import java.util.NoSuchElementException; import java.util.StringTokenizer; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.sql.impl.CharNameTable; import com.l2jmobius.gameserver.handler.ITelnetHandler; import com.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -275,10 +274,6 @@ public class PlayerHandler implements ITelnetHandler } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } } } else if (command.startsWith("unjail")) @@ -305,10 +300,6 @@ public class PlayerHandler implements ITelnetHandler } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } } } return false; 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 11b6ac4d36..3b8385d6f5 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 @@ -16,7 +16,6 @@ */ package instances; -import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.List; import java.util.logging.Logger; @@ -98,11 +97,6 @@ public abstract class AbstractInstance extends AbstractNpcAI { handleRemoveBuffs(instance); } - - if (Config.DEBUG_INSTANCES) - { - _log.info("Instance " + inst.getName() + " (" + instance.getTemplateId() + ") has been created by player " + player.getName()); - } } } @@ -233,11 +227,6 @@ public abstract class AbstractInstance extends AbstractNpcAI player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE).addString(InstanceManager.getInstance().getInstance(world.getInstanceId()).getName())); } } - - if (Config.DEBUG_INSTANCES) - { - _log.info("Time restrictions has been set for player in instance ID: " + world.getInstanceId() + " (" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(time) + ")"); - } } private void handleRemoveBuffs(L2PcInstance player, InstanceWorld world) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini b/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini index bf91fd2cc3..5eb06dab10 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini @@ -121,11 +121,3 @@ LoginRestartSchedule = False # Time in hours. # Default: 24 LoginRestartTime = 24 - - -# --------------------------------------------------------------------------- -# Developer Settings -# --------------------------------------------------------------------------- - -# Default: False -Debug = False diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java index adc5f3955c..3288212abe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java @@ -456,8 +456,6 @@ public final class Config public static boolean SKILL_CHECK_ENABLE; public static boolean SKILL_CHECK_REMOVE; public static boolean SKILL_CHECK_GM; - public static boolean DEBUG; - public static boolean DEBUG_INSTANCES; public static boolean HTML_ACTION_CACHE_DEBUG; public static boolean PACKET_HANDLER_DEBUG; public static boolean DEVELOPER; @@ -1832,8 +1830,6 @@ public final class Config SKILL_CHECK_ENABLE = General.getBoolean("SkillCheckEnable", false); SKILL_CHECK_REMOVE = General.getBoolean("SkillCheckRemove", false); SKILL_CHECK_GM = General.getBoolean("SkillCheckGM", true); - DEBUG = General.getBoolean("Debug", false); - DEBUG_INSTANCES = General.getBoolean("InstanceDebug", false); HTML_ACTION_CACHE_DEBUG = General.getBoolean("HtmlActionCacheDebug", false); PACKET_HANDLER_DEBUG = General.getBoolean("PacketHandlerDebug", false); DEVELOPER = General.getBoolean("Developer", false); @@ -2923,8 +2919,6 @@ public final class Config DATAPACK_ROOT = new File("."); } - DEBUG = ServerSettings.getBoolean("Debug", false); - ACCEPT_NEW_GAMESERVER = ServerSettings.getBoolean("AcceptNewGameServer", true); LOGIN_TRY_BEFORE_BAN = ServerSettings.getInt("LoginTryBeforeBan", 5); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java index 9784e3eac6..9c5b1d15e8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java @@ -23,7 +23,6 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.Collection; import java.util.concurrent.Future; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -167,11 +166,6 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable @Override synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1) { - if (Config.DEBUG) - { - _log.warning(getClass().getSimpleName() + ": changeIntention(" + intention + ", " + arg0 + ", " + arg1 + ")"); - } - if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present { // Check if actor is not dead @@ -310,11 +304,6 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable */ private void thinkAttack() { - if (Config.DEBUG) - { - _log.warning(getClass().getSimpleName() + ": thinkAttack(); timeout=" + (_attackTimeout - GameTimeController.getInstance().getGameTicks())); - } - if ((_attackTimeout < GameTimeController.getInstance().getGameTicks()) && _actor.isRunning()) { _actor.setWalking(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java index 4f9ad29d37..d3b6bc88d3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java @@ -23,7 +23,6 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.Collection; import java.util.concurrent.Future; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -165,11 +164,6 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable @Override synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1) { - if (Config.DEBUG) - { - _log.info(getClass().getSimpleName() + ": changeIntention(" + intention + ", " + arg0 + ", " + arg1 + ")"); - } - if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present { // Check if actor is not dead @@ -305,11 +299,6 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable */ private void thinkAttack() { - if (Config.DEBUG) - { - _log.info(getClass().getSimpleName() + ": thinkAttack(); timeout=" + (_attackTimeout - GameTimeController.getInstance().getGameTicks())); - } - if ((_attackTimeout < GameTimeController.getInstance().getGameTicks()) && _actor.isRunning()) { // Set the actor movement type to walk and send Server->Client packet ChangeMoveType to all others L2PcInstance diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 32c4c133a8..8f7cd9c8d0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -151,11 +151,6 @@ public class ClanTable return null; } - if (Config.DEBUG) - { - _log.info(getClass().getSimpleName() + ": " + player.getObjectId() + "(" + player.getName() + ") requested a clan creation."); - } - if (10 > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java index 0019a1963d..b2634de946 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java @@ -20,7 +20,6 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.util.data.xml.IXmlReader; @@ -37,6 +36,7 @@ public final class HitConditionBonusData implements IXmlReader private int highBonus = 0; private int lowBonus = 0; private int darkBonus = 0; + @SuppressWarnings("unused") private int rainBonus = 0; /** @@ -52,16 +52,6 @@ public final class HitConditionBonusData implements IXmlReader { parseDatapackFile("data/stats/hitConditionBonus.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded Hit Condition bonuses."); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Front bonus: " + frontBonus); - LOGGER.info(getClass().getSimpleName() + ": Side bonus: " + sideBonus); - LOGGER.info(getClass().getSimpleName() + ": Back bonus: " + backBonus); - LOGGER.info(getClass().getSimpleName() + ": High bonus: " + highBonus); - LOGGER.info(getClass().getSimpleName() + ": Low bonus: " + lowBonus); - LOGGER.info(getClass().getSimpleName() + ": Dark bonus: " + darkBonus); - LOGGER.info(getClass().getSimpleName() + ": Rain bonus: " + rainBonus); - } } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java index 8411eac942..f21c044ca9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java @@ -907,10 +907,6 @@ public class AugmentationData } stat12 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; resultColor=" + resultColor + "; level=" + lifeStoneLevel + "; grade=" + lifeStoneGrade); - } return new L2Augmentation(((stat34 << 16) + stat12)); } @@ -1039,10 +1035,6 @@ public class AugmentationData // stat12 has stats only stat12 = base + skillsLength + (ACC_STAT_SUBBLOCKSIZE * resultColor) + stat12; - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Accessory augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; level=" + lifeStoneLevel); - } return new L2Augmentation(((stat34 << 16) + stat12)); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/ItemTable.java index 14cbdbf9dd..23bdb46155 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/ItemTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/ItemTable.java @@ -232,11 +232,6 @@ public class ItemTable } } - if (Config.DEBUG) - { - LOGGER.fine(getClass().getSimpleName() + ": Item created oid:" + item.getObjectId() + " itemid:" + itemId); - } - // Add the L2ItemInstance object to _allObjects of L2world L2World.getInstance().storeObject(item); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SkillData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SkillData.java index 56ae4cf01c..2e8db0f6e9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SkillData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SkillData.java @@ -20,10 +20,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.engines.DocumentEngine; import com.l2jmobius.gameserver.model.skills.Skill; @@ -117,10 +115,6 @@ public final class SkillData // requested level too high if ((maxLvl > 0) && (level > maxLvl)) { - if (Config.DEBUG) - { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": call to unexisting skill level id: " + skillId + " requested level: " + level + " max level: " + maxLvl, new Throwable()); - } return _skills.get(getSkillHashCode(skillId, maxLvl)); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 79022f5289..e927aae2e2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -103,12 +103,6 @@ public final class CastleManorManager implements IXmlReader, IStorable { ThreadPoolManager.scheduleAtFixedRate(this::storeMe, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000); } - - // Send debug message - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode); - } } else { @@ -430,10 +424,6 @@ public final class CastleManorManager implements IXmlReader, IStorable } } scheduleModeChange(); - if (Config.DEBUG) - { - LOGGER.info(getClass().getName() + ": Manor mode changed to " + _mode + "!"); - } } public final void setNextSeedProduction(List list, int castleId) 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 76526f7503..f7837f4248 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 @@ -169,10 +169,6 @@ public class Lottery _log.log(Level.WARNING, "Lottery: Could not restore lottery data: " + e.getMessage(), e); } - if (Config.DEBUG) - { - _log.info("Lottery: Starting ticket sell for lottery #" + getId() + "."); - } _isSellingTickets = true; _isStarted = true; @@ -225,10 +221,6 @@ public class Lottery @Override public void run() { - if (Config.DEBUG) - { - _log.info("Lottery: Stopping ticket sell for lottery #" + getId() + "."); - } _isSellingTickets = false; Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.LOTTERY_TICKET_SALES_HAVE_BEEN_TEMPORARILY_SUSPENDED)); @@ -245,11 +237,6 @@ public class Lottery @Override public void run() { - if (Config.DEBUG) - { - _log.info("Lottery: Ending lottery #" + getId() + "."); - } - final int[] luckynums = new int[5]; int luckynum = 0; @@ -274,11 +261,6 @@ public class Lottery luckynums[i] = luckynum; } - if (Config.DEBUG) - { - _log.info("Lottery: The lucky numbers are " + luckynums[0] + ", " + luckynums[1] + ", " + luckynums[2] + ", " + luckynums[3] + ", " + luckynums[4] + "."); - } - int enchant = 0; int type2 = 0; @@ -294,11 +276,6 @@ public class Lottery } } - if (Config.DEBUG) - { - _log.info("Lottery: Encoded lucky numbers are " + enchant + ", " + type2); - } - int count1 = 0; int count2 = 0; int count3 = 0; @@ -386,20 +363,7 @@ public class Lottery prize3 = (long) (((getPrize() - prize4) * Config.ALT_LOTTERY_3_NUMBER_RATE) / count3); } - if (Config.DEBUG) - { - _log.info("Lottery: " + count1 + " players with all FIVE numbers each win " + prize1 + "."); - _log.info("Lottery: " + count2 + " players with FOUR numbers each win " + prize2 + "."); - _log.info("Lottery: " + count3 + " players with THREE numbers each win " + prize3 + "."); - _log.info("Lottery: " + count4 + " players with ONE or TWO numbers each win " + prize4 + "."); - } - final long newprize = getPrize() - (prize1 + prize2 + prize3 + prize4); - if (Config.DEBUG) - { - _log.info("Lottery: Jackpot for next lottery is " + newprize + "."); - } - SystemMessage sm; if (count1 > 0) { @@ -552,11 +516,6 @@ public class Lottery res[1] = 200; } } - - if (Config.DEBUG) - { - _log.warning("count: " + count + ", id: " + id + ", enchant: " + enchant + ", type2: " + type2); - } } } } 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 e6ad8a780c..552506b543 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 @@ -475,11 +475,6 @@ public class CursedWeapon implements INamable public void saveData() { - if (Config.DEBUG) - { - _log.info("CursedWeapon: Saving data to disk."); - } - try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM cursed_weapons WHERE itemId = ?"); PreparedStatement ps = con.prepareStatement("INSERT INTO cursed_weapons (itemId, charId, playerKarma, playerPkKills, nbKills, endTime) VALUES (?, ?, ?, ?, ?, ?)")) 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 6f5936bfaf..1846232849 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 @@ -975,10 +975,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(9, getNewLeaderId()); ps.setInt(10, getId()); ps.execute(); - if (Config.DEBUG) - { - _log.fine("New clan leader saved in db: " + getId()); - } } catch (Exception e) { @@ -1020,10 +1016,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(12, getAllyCrestId()); ps.setInt(13, getNewLeaderId()); ps.execute(); - if (Config.DEBUG) - { - _log.fine("New clan saved in db: " + getId()); - } } catch (Exception e) { @@ -1127,11 +1119,6 @@ public class L2Clan implements IIdentifiable, INamable } } - if (Config.DEBUG && (getName() != null)) - { - _log.info("Restored clan data for \"" + getName() + "\" from database."); - } - restoreSubPledges(); restoreRankPrivs(); restoreSkills(); @@ -1897,11 +1884,6 @@ public class L2Clan implements IIdentifiable, INamable // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } - - if (Config.DEBUG) - { - _log.fine("New sub_clan saved in db: " + getId() + "; " + pledgeType); - } } catch (Exception e) { @@ -1967,10 +1949,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(3, getId()); ps.setInt(4, pledgeType); ps.execute(); - if (Config.DEBUG) - { - _log.fine("Subpledge updated in db: " + getId()); - } } catch (Exception e) { @@ -2405,11 +2383,6 @@ public class L2Clan implements IIdentifiable, INamable return; } - if (Config.DEBUG) - { - _log.fine(player.getObjectId() + "(" + player.getName() + ") requested ally creation from "); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2GroupSpawn.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2GroupSpawn.java index 74dd87a54e..b8684c015d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2GroupSpawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2GroupSpawn.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.sql.impl.TerritoryTable; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2ControllableMobInstance; @@ -84,10 +83,6 @@ public class L2GroupSpawn extends L2Spawn mob.spawnMe(newlocx, newlocy, newlocz); mob.onSpawn(); - if (Config.DEBUG) - { - _log.finest("Spawned Mob Id: " + _template.getId() + " ,at: X: " + mob.getX() + " Y: " + mob.getY() + " Z: " + mob.getZ()); - } return mob; } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java index f5ac05eeff..32e2afcb82 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -687,10 +687,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable _lastSpawnPoints.put(mob.getObjectId(), new Location(newlocx, newlocy, newlocz)); } - if (Config.DEBUG) - { - _log.finest("Spawned Mob Id: " + _template.getId() + " , at: X: " + mob.getX() + " Y: " + mob.getY() + " Z: " + mob.getZ()); - } // Increase the current number of L2NpcInstance managed by this L2Spawn _currentCount++; return mob; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2World.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2World.java index 013938816f..3b44312f1d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2World.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2World.java @@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.sql.impl.CharNameTable; import com.l2jmobius.gameserver.data.xml.impl.AdminData; import com.l2jmobius.gameserver.model.actor.L2Playable; @@ -259,10 +258,6 @@ public final class L2World // Get all visible objects contained in the _visibleObjects of L2WorldRegions // in a circular area of 2000 units final List visibles = getVisibleObjects(object, 2000); - if (Config.DEBUG) - { - _log.finest("objects in range:" + visibles.size()); - } // tell the player about the surroundings // Go through the visible objects contained in the circular area 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 ebc34c87b4..16f8e738ac 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 @@ -25,7 +25,6 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import com.l2jmobius.gameserver.instancemanager.ClanHallManager; @@ -153,21 +152,11 @@ public final class L2AuctioneerInstance extends L2Npc return; } - if (Config.DEBUG) - { - _log.warning("bidding show successful"); - } - try { final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); final int auctionId = Integer.parseInt(val); - if (Config.DEBUG) - { - _log.warning("auction test started"); - } - final String filename = "data/html/auction/AgitAuctionInfo.htm"; final Auction a = ClanHallAuctionManager.getInstance().getAuction(auctionId); @@ -182,7 +171,7 @@ public final class L2AuctioneerInstance extends L2Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -298,11 +287,6 @@ public final class L2AuctioneerInstance extends L2Npc limit *= Integer.parseInt(val); } - if (Config.DEBUG) - { - _log.warning("cmd list: auction test started"); - } - final StringBuilder items = new StringBuilder(); items.append(""); for (int j = 1; j <= npage; j++) @@ -385,11 +369,6 @@ public final class L2AuctioneerInstance extends L2Npc auctionId = Integer.parseInt(val); } - if (Config.DEBUG) - { - _log.warning("cmd bidlist: auction test started"); - } - String biders = ""; final Map bidders = ClanHallAuctionManager.getInstance().getAuction(auctionId).getBidders(); for (Bidder b : bidders.values()) @@ -425,7 +404,7 @@ public final class L2AuctioneerInstance extends L2Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -456,7 +435,7 @@ public final class L2AuctioneerInstance extends L2Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); 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 7fcb5c81fa..dc74680c3b 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 @@ -360,7 +360,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } } - html.replace("%cost%", cost + "Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Provides additional HP recovery for clan members in the clan hall." + percent + "%"); html.replace("%apply%", "recovery hp " + percent); sendHtmlMessage(player, html); @@ -402,7 +402,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Provides additional MP recovery for clan members in the clan hall." + percent + "%"); html.replace("%apply%", "recovery mp " + percent); sendHtmlMessage(player, html); @@ -454,7 +454,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the clan hall." + percent + "%"); html.replace("%apply%", "recovery exp " + percent); sendHtmlMessage(player, html); @@ -465,10 +465,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm"); @@ -575,10 +571,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm"); @@ -645,10 +637,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Exp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm"); @@ -737,7 +725,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final String mp_grade3 = "[5%][15%][30%][40%]"; if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null) { - html.replace("%hp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() + "% (" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease() + "Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%hp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() + "% (" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease() + "Adena /" + (Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getEndTime())); final int grade = getClanHall().getGrade(); switch (grade) @@ -795,7 +783,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null) { - html.replace("%exp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() + "% (" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease() + "Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%exp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() + "% (" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease() + "Adena /" + (Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getEndTime())); final int grade = getClanHall().getGrade(); switch (grade) @@ -853,7 +841,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null) { - html.replace("%mp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() + "% (" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease() + "Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%mp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() + "% (" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease() + "Adena /" + (Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getEndTime())); final int grade = getClanHall().getGrade(); switch (grade) @@ -971,7 +959,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Allow the purchase of special items at fixed intervals."); html.replace("%apply%", "other item " + stage); sendHtmlMessage(player, html); @@ -1028,7 +1016,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Enables the use of supplementary magic."); html.replace("%apply%", "other support " + stage); sendHtmlMessage(player, html); @@ -1055,7 +1043,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Teleports clan members in a clan hall to the target Stage " + stage + " staging area"); html.replace("%apply%", "other tele " + stage); sendHtmlMessage(player, html); @@ -1070,10 +1058,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance player.sendMessage("This clan hall has no owner, you cannot change the configuration."); return; } - if (Config.DEBUG) - { - _log.warning("Item editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm"); @@ -1131,10 +1115,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Tele editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm"); @@ -1186,10 +1166,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Support editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm"); @@ -1277,7 +1253,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final String item = "[Level 1][Level 2][Level 3]"; if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null) { - html.replace("%tele%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease() + "Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%tele%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease() + "Adena /" + (Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getEndTime())); html.replace("%change_tele%", "[Deactivate]" + tele); } @@ -1289,7 +1265,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null) { - html.replace("%support%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease() + "Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%support%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease() + "Adena /" + (Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getEndTime())); final int grade = getClanHall().getGrade(); switch (grade) @@ -1347,7 +1323,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null) { - html.replace("%item%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease() + "Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%item%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease() + "Adena /" + (Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%item_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getEndTime())); html.replace("%change_item%", "[Deactivate]" + item); } @@ -1406,7 +1382,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "These curtains can be used to decorate the clan hall."); html.replace("%apply%", "deco curtains " + stage); sendHtmlMessage(player, html); @@ -1433,7 +1409,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Used to decorate the clan hall."); html.replace("%apply%", "deco fixtures " + stage); sendHtmlMessage(player, html); @@ -1444,10 +1420,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Deco curtains editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm"); @@ -1499,10 +1471,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Deco fixtures editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-apply_confirmed.htm"); @@ -1556,7 +1524,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final String fixtures = "[Level 1][Level 2]"; if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null) { - html.replace("%curtain%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease() + "Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%curtain%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease() + "Adena /" + (Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%curtain_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getEndTime())); html.replace("%change_curtain%", "[Deactivate]" + curtains); } @@ -1568,7 +1536,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null) { - html.replace("%fixture%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease() + "Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%fixture%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease() + "Adena /" + (Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%fixture_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getEndTime())); html.replace("%change_fixture%", "[Deactivate]" + fixtures); } @@ -1788,10 +1756,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance private void doTeleport(L2PcInstance player, int val) { - if (Config.DEBUG) - { - _log.warning("doTeleport(L2PcInstance player, int val) is called"); - } final L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val); if (list != null) { @@ -1802,10 +1766,6 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } else if (player.destroyItemByItemId("Teleport", list.getItemId(), list.getPrice(), this, true)) { - if (Config.DEBUG) - { - _log.warning("Teleporting player " + player.getName() + " for CH to new location: " + list.getLocX() + ":" + list.getLocY() + ":" + list.getLocZ()); - } player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ()); } } 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 5fed2b2011..e36a8d5418 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 @@ -22,7 +22,6 @@ import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.datatables.SkillData; @@ -552,11 +551,6 @@ public final class L2CubicInstance implements IIdentifiable final byte shld = Formulas.calcShldUse(_owner, target, skill); int damage = (int) Formulas.calcMagicDam(this, target, skill, mcrit, shld); - if (Config.DEBUG) - { - _log.info("L2SkillMdam: useCubicSkill() -> damage = " + damage); - } - if (damage > 0) { // Manage attack or cast break of the target (calculating rate, sending message...) @@ -582,11 +576,6 @@ public final class L2CubicInstance implements IIdentifiable public void useCubicDrain(Skill skill, L2Object[] targets) { - if (Config.DEBUG) - { - _log.info("L2SkillDrain: useCubicSkill()"); - } - for (L2Character target : (L2Character[]) targets) { if (target.isAlikeDead()) @@ -598,10 +587,6 @@ public final class L2CubicInstance implements IIdentifiable final byte shld = Formulas.calcShldUse(_owner, target, skill); final int damage = (int) Formulas.calcMagicDam(this, target, skill, mcrit, shld); - if (Config.DEBUG) - { - _log.info("L2SkillDrain: useCubicSkill() -> damage = " + damage); - } // TODO: Unhardcode fixed value final double hpAdd = (0.4 * damage); @@ -628,11 +613,6 @@ public final class L2CubicInstance implements IIdentifiable public void useCubicDisabler(Skill skill, L2Object[] targets) { - if (Config.DEBUG) - { - _log.info("Disablers: useCubicSkill()"); - } - for (L2Character target : (L2Character[]) targets) { if ((target == null) || target.isDead()) @@ -654,18 +634,6 @@ public final class L2CubicInstance implements IIdentifiable { DuelManager.getInstance().onBuff(target.getActingPlayer(), skill); } - - if (Config.DEBUG) - { - _log.info("Disablers: useCubicSkill() -> success"); - } - } - else - { - if (Config.DEBUG) - { - _log.info("Disablers: useCubicSkill() -> failed"); - } } } @@ -680,18 +648,6 @@ public final class L2CubicInstance implements IIdentifiable // Apply effects skill.applyEffects(_owner, target, false, false, true, 0); - - if (Config.DEBUG) - { - _log.info("Disablers: useCubicSkill() -> success"); - } - } - else - { - if (Config.DEBUG) - { - _log.info("Disablers: useCubicSkill() -> failed"); - } } } } 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 94adc673dc..97775aaf43 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 @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2FortSiegeGuardAI; @@ -129,10 +128,6 @@ public class L2DefenderInstance extends L2Attackable } if (!isInsideRadius(getSpawn(), 40, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); @@ -172,11 +167,6 @@ public class L2DefenderInstance extends L2Attackable // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - _log.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java index 27b0793dac..725d834081 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; @@ -105,10 +104,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance { if (!isInsideRadius(getSpawn(), 200, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); 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 220c231a1f..785fb0479a 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 @@ -418,7 +418,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } } - html.replace("%cost%", cost + "Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Provides additional HP recovery for clan members in the fortress." + percent + "%"); html.replace("%apply%", "recovery hp " + percent); sendHtmlMessage(player, html); @@ -445,7 +445,7 @@ public class L2FortManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Provides additional MP recovery for clan members in the fortress." + percent + "%"); html.replace("%apply%", "recovery mp " + percent); sendHtmlMessage(player, html); @@ -472,7 +472,7 @@ public class L2FortManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the fortress." + percent + "%"); html.replace("%apply%", "recovery exp " + percent); sendHtmlMessage(player, html); @@ -483,10 +483,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -534,10 +530,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -585,10 +577,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Exp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -639,7 +627,7 @@ public class L2FortManagerInstance extends L2MerchantInstance final String mp = "[40%][50%]"; if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null) { - html.replace("%hp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() + "% (" + getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease() + "Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%hp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() + "% (" + getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease() + "Adena /" + (Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_HP).getEndTime())); html.replace("%change_hp%", "[Deactivate]" + hp); } @@ -651,7 +639,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null) { - html.replace("%exp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() + "% (" + getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease() + "Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%exp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() + "% (" + getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease() + "Adena /" + (Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getEndTime())); html.replace("%change_exp%", "[Deactivate]" + exp); } @@ -663,7 +651,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } if (getFort().getFunction(Fort.FUNC_RESTORE_MP) != null) { - html.replace("%mp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() + "% (" + getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease() + "Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%mp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() + "% (" + getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease() + "Adena /" + (Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_MP).getEndTime())); html.replace("%change_mp%", "[Deactivate]" + mp); } @@ -722,7 +710,7 @@ public class L2FortManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Enables the use of supplementary magic."); html.replace("%apply%", "other support " + stage); sendHtmlMessage(player, html); @@ -749,7 +737,7 @@ public class L2FortManagerInstance extends L2MerchantInstance break; } } - html.replace("%cost%", cost + "Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%cost%", cost + "Adena /" + (Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%use%", "Teleports clan members in a fort to the target Stage " + stage + " staging area"); html.replace("%apply%", "other tele " + stage); sendHtmlMessage(player, html); @@ -760,10 +748,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Tele editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -811,10 +795,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Support editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -867,7 +847,7 @@ public class L2FortManagerInstance extends L2MerchantInstance final String support = "[Level 1][Level 2]"; if (getFort().getFunction(Fort.FUNC_TELEPORT) != null) { - html.replace("%tele%", "Stage " + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + " (" + getFort().getFunction(Fort.FUNC_TELEPORT).getLease() + "Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%tele%", "Stage " + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + " (" + getFort().getFunction(Fort.FUNC_TELEPORT).getLease() + "Adena /" + (Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_TELEPORT).getEndTime())); html.replace("%change_tele%", "[Deactivate]" + tele); } @@ -879,7 +859,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } if (getFort().getFunction(Fort.FUNC_SUPPORT) != null) { - html.replace("%support%", "Stage " + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + " (" + getFort().getFunction(Fort.FUNC_SUPPORT).getLease() + "Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%support%", "Stage " + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + " (" + getFort().getFunction(Fort.FUNC_SUPPORT).getLease() + "Adena /" + (Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_SUPPORT).getEndTime())); html.replace("%change_support%", "[Deactivate]" + support); } @@ -1022,19 +1002,11 @@ public class L2FortManagerInstance extends L2MerchantInstance private void doTeleport(L2PcInstance player, int val) { - if (Config.DEBUG) - { - _log.warning("doTeleport(L2PcInstance player, int val) is called"); - } final L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val); if (list != null) { if (player.destroyItemByItemId("Teleport", list.getItemId(), list.getPrice(), this, true)) { - if (Config.DEBUG) - { - _log.warning("Teleporting player " + player.getName() + " for Fortress to new location: " + list.getLocX() + ":" + list.getLocY() + ":" + list.getLocZ()); - } player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 31ef58375d..e404331fc5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.model.L2World; @@ -39,8 +36,6 @@ import com.l2jmobius.util.Rnd; */ public class L2GuardInstance extends L2Attackable { - private static Logger _log = Logger.getLogger(L2GuardInstance.class.getName()); - /** * Creates a guard. * @param template the guard NPC template @@ -153,11 +148,6 @@ public class L2GuardInstance extends L2Attackable // Check if the L2PcInstance is in the _aggroList of the L2GuardInstance if (isInAggroList(player)) { - if (Config.DEBUG) - { - _log.fine(player.getObjectId() + ": Attacked guard " + getObjectId()); - } - // Set the L2PcInstance Intention to AI_INTENTION_ATTACK player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index 24323539a8..085f7a739d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; import java.util.Map; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.InstanceType; @@ -73,11 +72,6 @@ public class L2NpcInstance extends L2Npc */ public static void showSkillList(L2PcInstance player, L2Npc npc, ClassId classId) { - if (Config.DEBUG) - { - _log.fine("SkillList activated on: " + npc.getObjectId()); - } - final int npcId = npc.getTemplate().getId(); if (npcId == 32611) // Tolonis (Officer) { 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 d5a038f487..4774ac92d7 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 @@ -3853,20 +3853,11 @@ public final class L2PcInstance extends L2Playable // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting if ((hasSummon() && (getSummon().getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return null; } if (getActiveEnchantItemId() == objectId) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return null; } @@ -10910,20 +10901,11 @@ public final class L2PcInstance extends L2Playable // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting if ((hasSummon() && (getSummon().getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return false; } if (getActiveEnchantItemId() == objectId) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return false; } 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 1a951c75be..bfeaef2aa8 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 @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.concurrent.Future; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.DoorData; @@ -118,11 +117,6 @@ public class L2SepulcherNpcInstance extends L2Npc // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - _log.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); } 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 46529f4df0..0497ee9ce8 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 @@ -302,11 +302,6 @@ public final class L2TeleporterInstance extends L2Npc if (Config.FREE_TELEPORTING || player.destroyItemByItemId("Teleport " + (list.getIsForNoble() ? " nobless" : ""), list.getItemId(), price, this, true)) { - if (Config.DEBUG) - { - _log.info("Teleporting player " + player.getName() + " to new location: " + list.getLocX() + ":" + list.getLocY() + ":" + list.getLocZ()); - } - player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ(), player.getHeading(), -1); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java index 32edeee7d5..f0a8d3d34a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.knownlist; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.model.L2Object; @@ -26,8 +24,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; public class GuardKnownList extends AttackableKnownList { - private static final Logger _log = Logger.getLogger(GuardKnownList.class.getName()); - public GuardKnownList(L2GuardInstance activeChar) { super(activeChar); @@ -46,11 +42,6 @@ public class GuardKnownList extends AttackableKnownList // Check if the object added is a L2PcInstance that owns Karma if (object.getActingPlayer().getKarma() > 0) { - if (Config.DEBUG) - { - _log.fine(getActiveChar().getObjectId() + ": PK " + object.getObjectId() + " entered scan range"); - } - // Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) { @@ -63,11 +54,6 @@ public class GuardKnownList extends AttackableKnownList // Check if the object added is an aggressive L2MonsterInstance if (((L2MonsterInstance) object).isAggressive()) { - if (Config.DEBUG) - { - _log.fine(getActiveChar().getObjectId() + ": Aggressive mob " + object.getObjectId() + " entered scan range"); - } - // Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) { 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 898ac9bf06..5a821be2af 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 @@ -22,7 +22,6 @@ import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -171,11 +170,6 @@ public class CharStatus getActiveChar().abortAttack(); getActiveChar().abortCast(); - if (Config.DEBUG) - { - _log.fine("char is dead."); - } - getActiveChar().doDie(attacker); } } @@ -197,11 +191,6 @@ public class CharStatus { if ((_regTask == null) && !getActiveChar().isDead()) { - if (Config.DEBUG) - { - _log.fine("HP/MP regen started"); - } - // Get the Regeneration period final int period = Formulas.getRegeneratePeriod(getActiveChar()); @@ -222,11 +211,6 @@ public class CharStatus { if (_regTask != null) { - if (Config.DEBUG) - { - _log.fine("HP/MP regen stop"); - } - // Stop the HP/MP/CP Regeneration task _regTask.cancel(false); _regTask = null; 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 d871d0f1b4..fcb91de052 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 @@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2CubicInstance; import com.l2jmobius.gameserver.model.effects.L2EffectType; @@ -138,12 +137,6 @@ public final class CubicAction implements Runnable final L2Character target = _cubic.getTarget(); if ((target != null) && !target.isDead()) { - if (Config.DEBUG) - { - _log.info("L2CubicInstance: Action.run();"); - _log.info("Cubic ID: " + _cubic.getId() + " Target: " + target.getName() + " distance: " + target.calculateDistance(_cubic.getOwner(), true, false)); - } - _cubic.getOwner().broadcastPacket(new MagicSkillUse(_cubic.getOwner(), target, skill.getId(), skill.getLevel(), 0, 0)); final L2Character[] targets = @@ -153,59 +146,31 @@ public final class CubicAction implements Runnable if (skill.isContinuous()) { - if (Config.DEBUG) - { - _log.info("L2CubicInstance: Action.run() skill " + skill); - } _cubic.useCubicContinuous(skill, targets); } else { skill.activateSkill(_cubic, targets); - if (Config.DEBUG) - { - _log.info("L2CubicInstance: Action.run(); other handler"); - } } if (skill.hasEffectType(L2EffectType.MAGICAL_ATTACK)) { - if (Config.DEBUG) - { - _log.info("L2CubicInstance: Action.run() skill " + skill); - } _cubic.useCubicMdam(skill, targets); } else if (skill.hasEffectType(L2EffectType.HP_DRAIN)) { - if (Config.DEBUG) - { - _log.info("L2CubicInstance: Action.run() skill " + skill); - } _cubic.useCubicDrain(skill, targets); } else if (skill.hasEffectType(L2EffectType.STUN, L2EffectType.ROOT, L2EffectType.PARALYZE)) { - if (Config.DEBUG) - { - _log.info("L2CubicInstance: Action.run() skill " + skill); - } _cubic.useCubicDisabler(skill, targets); } else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME, L2EffectType.DMG_OVER_TIME_PERCENT)) { - if (Config.DEBUG) - { - _log.info("L2CubicInstance: Action.run() skill " + skill); - } _cubic.useCubicContinuous(skill, targets); } else if (skill.hasEffectType(L2EffectType.AGGRESSION)) { - if (Config.DEBUG) - { - _log.info("L2CubicInstance: Action.run() skill " + skill); - } _cubic.useCubicDisabler(skill, targets); } 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 507363fb69..f255b89a5d 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 @@ -25,7 +25,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.datatables.SpawnTable; @@ -305,11 +304,6 @@ public final class BlockCheckerEngine _abnormalEnd = true; ThreadPoolManager.execute(new EndEvent()); - - if (Config.DEBUG) - { - _log.config("Handys Block Checker Event at arena " + _arena + " ended due lack of players!"); - } } } catch (Exception e) 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 913e2e4f5a..96229ac624 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 @@ -1327,11 +1327,6 @@ public abstract class Inventory extends ItemContainer */ public L2ItemInstance unEquipItemInBodySlot(int slot) { - if (Config.DEBUG) - { - _log.info(Inventory.class.getSimpleName() + ": Unequip body slot:" + slot); - } - int pdollSlot = -1; switch (slot) 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 85517e7b80..af1e7e48c3 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 @@ -273,10 +273,6 @@ public final class Skill implements IIdentifiable if (Config.ENABLE_MODIFY_SKILL_REUSE && Config.SKILL_REUSE_LIST.containsKey(_id)) { - if (Config.DEBUG) - { - _log.info("*** Skill " + _name + " (" + _level + ") changed reuse from " + set.getInt("reuseDelay", 0) + " to " + Config.SKILL_REUSE_LIST.get(_id) + " seconds."); - } _reuseDelay = Config.SKILL_REUSE_LIST.get(_id); } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 5a56f3b0a2..cd32fe7498 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.stats; import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.SevenSigns; @@ -84,8 +83,6 @@ import com.l2jmobius.util.Rnd; */ public final class Formulas { - private static final Logger _log = Logger.getLogger(Formulas.class.getName()); - /** Regeneration Task period. */ private static final int HP_REGENERATE_PERIOD = 3000; // 3 secs @@ -520,11 +517,6 @@ public final class Formulas // Check the distance between the player and the player spawn point, in the center of the arena. final double distToCenter = activeChar.calculateDistance(festivalCenter[0], festivalCenter[1], 0, false, false); - if (Config.DEBUG) - { - _log.info("Distance: " + distToCenter + ", RegenMulti: " + ((distToCenter * 2.5) / 50)); - } - return 1.0 - (distToCenter * 0.0005); // Maximum Decreased Regen of ~ -65%; } 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 f07bca0e97..3e3d6ff50b 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 @@ -32,8 +32,11 @@ public final class Action extends L2GameClientPacket private static final String __C__1F_ACTION = "[C] 1F Action"; private int _objectId; + @SuppressWarnings("unused") private int _originX; + @SuppressWarnings("unused") private int _originY; + @SuppressWarnings("unused") private int _originZ; private int _actionId; @@ -50,11 +53,6 @@ public final class Action extends L2GameClientPacket @Override protected void runImpl() { - if (Config.DEBUG) - { - _log.info(getType() + ": " + (_actionId == 0 ? "Simple-click" : "Shift-click") + " Target object ID: " + _objectId + " orignX: " + _originX + " orignY: " + _originY + " orignZ: " + _originZ); - } - // Get the current L2PcInstance of the player final L2PcInstance activeChar = getActiveChar(); if (activeChar == null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 7d72d95202..43626f1315 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.LoginServerThread; import com.l2jmobius.gameserver.LoginServerThread.SessionKey; import com.l2jmobius.gameserver.network.L2GameClient; @@ -60,11 +59,6 @@ public final class AuthLogin extends L2GameClientPacket return; } final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2); - if (Config.DEBUG) - { - _log.info("user:" + _loginName); - _log.info("key:" + key); - } // avoid potential exploits if (client.getAccountName() == null) 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 113b3b43e1..086e867808 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 @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -52,10 +51,6 @@ public final class CannotMoveAnymore extends L2GameClientPacket return; } - if (Config.DEBUG) - { - _log.fine("client: x:" + _x + " y:" + _y + " z:" + _z + " server x:" + player.getX() + " y:" + player.getY() + " z:" + player.getZ()); - } if (player.getAI() != null) { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); 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 d814aa25ba..295e2bbf9f 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 @@ -99,11 +99,6 @@ public final class CharacterCreate extends L2GameClientPacket // Last Verified: May 30, 2009 - Gracia Final - Players are able to create characters with names consisting of as little as 1,2,3 letter/number combinations. if ((_name.length() < 1) || (_name.length() > 16)) { - if (Config.DEBUG) - { - _log.fine("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Your title cannot exceed 16 characters in length. Please try again."); - } - sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS)); return; } @@ -123,11 +118,6 @@ public final class CharacterCreate extends L2GameClientPacket // Last Verified: May 30, 2009 - Gracia Final if (!Util.isAlphaNumeric(_name) || !isValidName(_name)) { - if (Config.DEBUG) - { - _log.fine("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Incorrect name. Please try again."); - } - sendPacket(new CharCreateFail(CharCreateFail.REASON_INCORRECT_NAME)); return; } @@ -166,21 +156,11 @@ public final class CharacterCreate extends L2GameClientPacket { if ((CharNameTable.getInstance().getAccountCharacterCount(getClient().getAccountName()) >= Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT) && (Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT != 0)) { - if (Config.DEBUG) - { - _log.fine("Max number of characters reached. Creation failed."); - } - sendPacket(new CharCreateFail(CharCreateFail.REASON_TOO_MANY_CHARACTERS)); return; } else if (CharNameTable.getInstance().doesCharNameExist(_name)) { - if (Config.DEBUG) - { - _log.fine("Character Creation Failure: Message generated: You cannot create another character. Please delete the existing character and try again."); - } - sendPacket(new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS)); return; } @@ -188,11 +168,6 @@ public final class CharacterCreate extends L2GameClientPacket template = PlayerTemplateData.getInstance().getTemplate(_classId); if ((template == null) || (ClassId.getClassId(_classId).level() > 0)) { - if (Config.DEBUG) - { - _log.fine("Character Creation Failure: " + _name + " classId: " + _classId + " Template: " + template + " Message generated: Your character creation has failed."); - } - sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -243,11 +218,6 @@ public final class CharacterCreate extends L2GameClientPacket private void initNewChar(L2GameClient client, L2PcInstance newChar) { - if (Config.DEBUG) - { - _log.fine("Character init start"); - } - L2World.getInstance().storeObject(newChar); if (Config.STARTING_ADENA > 0) @@ -304,11 +274,6 @@ public final class CharacterCreate extends L2GameClientPacket for (L2SkillLearn skill : SkillTreesData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true)) { - if (Config.DEBUG) - { - _log.fine("Adding starter skill:" + skill.getSkillId() + " / " + skill.getSkillLevel()); - } - newChar.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true); } @@ -327,11 +292,6 @@ public final class CharacterCreate extends L2GameClientPacket final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.setCharSelection(cl.getCharInfo()); - - if (Config.DEBUG) - { - _log.fine("Character init end"); - } } /** 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 3ee37f8a07..b7ae09cc87 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 @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.CharSelectInfoPackage; import com.l2jmobius.gameserver.model.events.Containers; import com.l2jmobius.gameserver.model.events.EventDispatcher; @@ -53,11 +52,6 @@ public final class CharacterDelete extends L2GameClientPacket // return; // } - if (Config.DEBUG) - { - _log.fine("deleting slot:" + _charSlot); - } - try { switch (getClient().markToDeleteChar(_charSlot)) 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 578f01e5a0..1954e55ddd 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 @@ -126,12 +126,6 @@ public class CharacterSelect extends L2GameClientPacket return; } - // The L2PcInstance must be created here, so that it can be attached to the L2GameClient - if (Config.DEBUG) - { - _log.fine("selected slot:" + _charSlot); - } - // load up character from disk final L2PcInstance cha = client.loadCharFromDisk(_charSlot); if (cha == null) 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 fbe7501855..1498207978 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 @@ -156,13 +156,10 @@ public class EnterWorld extends L2GameClientPacket } } - if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) - { - if (Config.DEBUG) - { - _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); - } - } + // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) + // { + // _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); + // } // Apply special GM properties to the GM when entering if (activeChar.isGM()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/L2GameClientPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/L2GameClientPacket.java index 52bb44b8b9..847be27537 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/L2GameClientPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/L2GameClientPacket.java @@ -20,7 +20,6 @@ import java.nio.BufferUnderflowException; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.mmocore.ReceivablePacket; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.L2GameClient; @@ -75,10 +74,6 @@ public abstract class L2GameClientPacket extends ReceivablePacket if ((actor != null) && (actor.isSpawnProtected() || actor.isInvul())) { actor.onActionRequest(); - if (Config.DEBUG) - { - _log.info("Spawn protection for player " + actor.getName() + " removed by packet: " + getType()); - } } } } 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 642e1dc5e6..9836dc49b7 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 @@ -55,10 +55,6 @@ public final class Logout extends L2GameClientPacket if ((player.getActiveEnchantItemId() != L2PcInstance.ID_NONE) || (player.getActiveEnchantAttrItemId() != L2PcInstance.ID_NONE)) { - if (Config.DEBUG) - { - _log.fine("Player " + player.getName() + " tried to logout while enchanting."); - } player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -78,11 +74,6 @@ public final class Logout extends L2GameClientPacket return; } - if (Config.DEBUG) - { - _log.fine("Player " + player.getName() + " tried to logout while fighting."); - } - player.sendPacket(SystemMessageId.YOU_CANNOT_EXIT_THE_GAME_WHILE_IN_COMBAT); player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java index b89b41808b..47322ff133 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.PlayerTemplateData; import com.l2jmobius.gameserver.model.base.ClassId; import com.l2jmobius.gameserver.network.serverpackets.NewCharacterSuccess; @@ -37,11 +36,6 @@ public final class NewCharacter extends L2GameClientPacket @Override protected void runImpl() { - if (Config.DEBUG) - { - _log.fine(_C__13_NEWCHARACTER); - } - final NewCharacterSuccess ct = new NewCharacterSuccess(); ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.fighter)); // Human Figther ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.mage)); // Human Mystic 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 d134c556c1..fa0155b63d 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 @@ -47,10 +47,6 @@ public final class ProtocolVersion extends L2GameClientPacket // this packet is never encrypted if (_version == -2) { - if (Config.DEBUG) - { - _log.info("Ping received"); - } // this is just a ping attempt from the new C2 client getClient().close((L2GameServerPacket) null); } @@ -69,11 +65,6 @@ public final class ProtocolVersion extends L2GameClientPacket } else { - if (Config.DEBUG) - { - _log.fine("Client Protocol Revision is ok: " + _version); - } - final KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 1); getClient().sendPacket(pk); getClient().setProtocolOk(true); 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 d6ac5e931e..09717b8090 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 @@ -95,11 +95,6 @@ public final class RequestActionUse extends L2GameClientPacket return; } - if (Config.DEBUG) - { - _log.info(getType() + ": " + activeChar + " requested action use ID: " + _actionId + " Ctrl pressed:" + _ctrlPressed + " Shift pressed:" + _shiftPressed); - } - // Don't do anything if player is dead or confused if ((activeChar.isFakeDeath() && (_actionId != 0)) || activeChar.isDead() || activeChar.isOutOfControl()) { @@ -1055,14 +1050,6 @@ public final class RequestActionUse extends L2GameClientPacket tryBroadcastSocial(15); break; } - default: - { - if (Config.DEBUG) - { - _log.warning(activeChar.getName() + ": unhandled action type " + _actionId); - } - break; - } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 24476f38ac..db41ece682 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.PrivateStoreType; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -54,11 +53,6 @@ public final class RequestAutoSoulShot extends L2GameClientPacket if ((activeChar.getPrivateStoreType() == PrivateStoreType.NONE) && (activeChar.getActiveRequester() == null) && !activeChar.isDead()) { - if (Config.DEBUG) - { - _log.fine("AutoSoulShot:" + _itemId); - } - final L2ItemInstance item = activeChar.getInventory().getItemByItemId(_itemId); if (item == null) { 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 ea08a76389..7d44a8cbbf 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 @@ -157,20 +157,12 @@ public final class RequestDropItem extends L2GameClientPacket if ((L2Item.TYPE2_QUEST == item.getItem().getType2()) && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ":player tried to drop quest item"); - } activeChar.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED_OR_EXCHANGED); return; } if (!activeChar.isInsideRadius(_x, _y, 0, 150, false, false) || (Math.abs(_z - activeChar.getZ()) > 50)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ": trying to drop too far away"); - } activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DISCARD_SOMETHING_THAT_FAR_AWAY_FROM_YOU); return; } @@ -181,11 +173,6 @@ public final class RequestDropItem extends L2GameClientPacket return; } - if (Config.DEBUG) - { - _log.fine("requested drop item " + _objectId + "(" + item.getCount() + ") at " + _x + "/" + _y + "/" + _z); - } - if (item.isEquipped()) { final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); @@ -204,11 +191,6 @@ public final class RequestDropItem extends L2GameClientPacket final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); - if (Config.DEBUG) - { - _log.fine("dropping " + _objectId + " item(" + _count + ") at: " + _x + " " + _y + " " + _z); - } - // activeChar.broadcastUserInfo(); if (activeChar.isGM()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java index 5cb152add7..683f0d4c3f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -134,11 +133,6 @@ public final class RequestDuelStart extends L2GameClientPacket activeChar.onTransactionRequest(partyLeader); partyLeader.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.fine(activeChar.getName() + " requested a duel with " + partyLeader.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(partyLeader.getName()); activeChar.sendPacket(msg); @@ -163,11 +157,6 @@ public final class RequestDuelStart extends L2GameClientPacket activeChar.onTransactionRequest(targetChar); targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.fine(activeChar.getName() + " requested a duel with " + targetChar.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(targetChar.getName()); activeChar.sendPacket(msg); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 4e500b6d38..48374b38e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -166,11 +166,6 @@ public final class RequestExEnchantSkill extends L2GameClientPacket final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED); sm.addSkillName(_skillId); player.sendPacket(sm); - - if (Config.DEBUG) - { - _log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requiredAdena + " Adena."); - } } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java index 57dcf4b30d..b22e3a643b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java @@ -183,11 +183,6 @@ public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket player.sendPacket(ExEnchantSkillResult.valueOf(true)); } - if (Config.DEBUG) - { - _log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena."); - } - player.sendPacket(new UserInfo(player)); player.sendPacket(new ExBrExtraUserInfo(player)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java index da61c0fdac..7990cd24fe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java @@ -160,11 +160,6 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket player.addSkill(skill, true); - if (Config.DEBUG) - { - _log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena."); - } - player.sendPacket(ExEnchantSkillResult.valueOf(true)); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_WAS_SUCCESSFUL_S1_HAS_BEEN_ENCHANTED); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java index 9ab295c52e..0d6268748d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java @@ -166,11 +166,6 @@ public final class RequestExEnchantSkillUntrain extends L2GameClientPacket player.addSkill(skill, true); player.sendPacket(ExEnchantSkillResult.valueOf(true)); - if (Config.DEBUG) - { - _log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena."); - } - player.sendPacket(new UserInfo(player)); player.sendPacket(new ExBrExtraUserInfo(player)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 1cbdeaf6c7..99cff16714 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -51,13 +50,6 @@ public class RequestExRqItemLink extends L2GameClientPacket { client.sendPacket(new ExRpItemLink(item)); } - else - { - if (Config.DEBUG) - { - _log.info(getClient() + " requested item link for item which wasnt published! ID:" + _objectId); - } - } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java index c40e775abe..3b22c628f1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.PartyDistributionType; import com.l2jmobius.gameserver.model.BlockList; import com.l2jmobius.gameserver.model.L2Party; @@ -184,23 +183,12 @@ public final class RequestJoinParty extends L2GameClientPacket // in case a leader change has happened, use party's mode target.sendPacket(new AskJoinParty(requestor.getName(), party.getDistributionType())); party.setPendingInvitation(true); - - if (Config.DEBUG) - { - _log.fine("sent out a party invitation to:" + target.getName()); - } - } else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); sm.addString(target.getName()); requestor.sendPacket(sm); - - if (Config.DEBUG) - { - _log.warning(requestor.getName() + " already received a party invitation"); - } } } @@ -222,21 +210,10 @@ public final class RequestJoinParty extends L2GameClientPacket target.setActiveRequester(requestor); requestor.onTransactionRequest(target); requestor.setPartyDistributionType(partyDistributionType); - - if (Config.DEBUG) - { - _log.fine("sent out a party invitation to:" + target.getName()); - } - } else { requestor.sendPacket(SystemMessageId.WAITING_FOR_ANOTHER_REPLY); - - if (Config.DEBUG) - { - _log.warning(requestor.getName() + " already received a party invitation"); - } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 628577a2ce..a036cd6ac8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.ArrayList; import java.util.List; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.MacroType; import com.l2jmobius.gameserver.model.Macro; import com.l2jmobius.gameserver.model.MacroCmd; @@ -49,11 +48,6 @@ public final class RequestMakeMacro extends L2GameClientPacket _count = MAX_MACRO_LENGTH; } - if (Config.DEBUG) - { - _log.info("Make macro id:" + _id + "\tname:" + _name + "\tdesc:" + _desc + "\tacronym:" + _acronym + "\ticon:" + _icon + "\tcount:" + _count); - } - final List commands = new ArrayList<>(_count); for (int i = 0; i < _count; i++) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java index 4bb1d99386..7c8a23f86f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -39,11 +36,6 @@ public final class RequestPledgeInfo extends L2GameClientPacket @Override protected void runImpl() { - if (Config.DEBUG) - { - _log.log(Level.FINE, "Info for clan " + _clanId + " requested"); - } - final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { @@ -53,10 +45,6 @@ public final class RequestPledgeInfo extends L2GameClientPacket final L2Clan clan = ClanTable.getInstance().getClan(_clanId); if (clan == null) { - if (Config.DEBUG) - { - _log.warning(getType() + ": Clan data for clanId " + _clanId + " is missing for player " + activeChar); - } return; // we have no clan data ?!? should not happen } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java index 8e17a8bbfa..3e44021c19 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.instancemanager.QuestManager; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Quest; @@ -57,20 +56,6 @@ public final class RequestQuestAbort extends L2GameClientPacket qs.exitQuest(true); activeChar.sendPacket(new QuestList()); } - else - { - if (Config.DEBUG) - { - _log.info("Player '" + activeChar.getName() + "' try to abort quest " + qe.getName() + " but he didn't have it started."); - } - } - } - else - { - if (Config.DEBUG) - { - _log.warning("Quest (id='" + _questId + "') not found."); - } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java index 165b711823..0aa9368900 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.RecipeController; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -31,10 +30,6 @@ public final class RequestRecipeBookOpen extends L2GameClientPacket protected void readImpl() { _isDwarvenCraft = (readD() == 0); - if (Config.DEBUG) - { - _log.info("RequestRecipeBookOpen : " + (_isDwarvenCraft ? "dwarvenCraft" : "commonCraft")); - } } @Override 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 da799cf01a..dacb31d54c 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 @@ -80,11 +80,6 @@ public final class RequestRestart extends L2GameClientPacket if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && Config.GM_RESTART_FIGHTING)) { - if (Config.DEBUG) - { - _log.fine("Player " + player.getName() + " tried to logout while fighting."); - } - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTART_WHILE_IN_COMBAT); sendPacket(RestartResponse.valueOf(false)); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index e7c3bb88eb..e27815458f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.PcCondOverride; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.items.L2EtcItem; @@ -49,11 +48,6 @@ public class RequestUnEquipItem extends L2GameClientPacket @Override protected void runImpl() { - if (Config.DEBUG) - { - _log.fine("Request unequip slot " + _slot); - } - final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { 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 14565e036f..693719ab5e 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 @@ -99,11 +99,6 @@ public final class Say2 extends L2GameClientPacket @Override protected void runImpl() { - if (Config.DEBUG) - { - _log.info("Say2: Msg Type = '" + _type + "' Text = '" + _text + "'."); - } - final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java index 8b2341d50e..6aba4d5dcd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.TradeList; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -53,10 +52,6 @@ public final class TradeDone extends L2GameClientPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - if (Config.DEBUG) - { - _log.warning("player.getTradeList == null in " + getType() + " for player " + player.getName()); - } return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index adfa5dd3d0..813446f527 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -147,10 +147,6 @@ public final class TradeRequest extends L2GameClientPacket if (player.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.fine("Already trading with someone else."); - } player.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE); return; } @@ -158,10 +154,6 @@ public final class TradeRequest extends L2GameClientPacket SystemMessage sm; if (partner.isProcessingRequest() || partner.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.info("Transaction already in progress."); - } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); sm.addString(partner.getName()); player.sendPacket(sm); 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 7c70475d1c..a037760415 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 @@ -91,11 +91,6 @@ public final class UseItem extends L2GameClientPacket return; } - if (Config.DEBUG) - { - _log.log(Level.INFO, activeChar + ": use item " + _objectId); - } - // Flood protect UseItem if (!getClient().getFloodProtectors().getUseItem().tryPerformAction("use item")) { @@ -346,10 +341,6 @@ public final class UseItem extends L2GameClientPacket { _log.log(Level.WARNING, "Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } - else if (Config.DEBUG) - { - _log.log(Level.WARNING, "No Item handler registered for Item Id: " + _itemId + "!"); - } return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java index c69bc6a9b7..8352ec8d11 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.serverpackets; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.SevenSigns; import com.l2jmobius.gameserver.SevenSignsFestival; import com.l2jmobius.gameserver.model.StatsSet; @@ -140,24 +139,6 @@ public class SSQStatus extends L2GameServerPacket duskPercent = Math.round(((float) duskTotalScore / (float) totalOverallScore) * 100); } - if (Config.DEBUG) - { - _log.info("Dusk Stone Score: " + duskStoneScore + " - Dawn Stone Score: " + dawnStoneScore); - _log.info("Dusk Festival Score: " + duskFestivalScore + " - Dawn Festival Score: " + dawnFestivalScore); - _log.info("Dusk Score: " + duskTotalScore + " - Dawn Score: " + dawnTotalScore); - _log.info("Overall Score: " + totalOverallScore); - _log.info(""); - if (totalStoneScore == 0) - { - _log.info("Dusk Prop: 0 - Dawn Prop: 0"); - } - else - { - _log.info("Dusk Prop: " + ((duskStoneScore / totalStoneScore) * 500) + " - Dawn Prop: " + ((dawnStoneScore / totalStoneScore) * 500)); - } - _log.info("Dusk %: " + duskPercent + " - Dawn %: " + dawnPercent); - } - /* DUSK */ writeQ(duskStoneScoreProp); // Seal Stone Score writeQ(duskFestivalScore); // Festival Score @@ -242,11 +223,6 @@ public class SSQStatus extends L2GameServerPacket final int dawnProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DAWN); final int duskProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DUSK); - if (Config.DEBUG) - { - _log.info(SevenSigns.getSealName(i, true) + " = Dawn Prop: " + dawnProportion + "(" + ((dawnProportion / totalDawnMembers) * 100) + "%), Dusk Prop: " + duskProportion + "(" + ((duskProportion / totalDuskMembers) * 100) + "%)"); - } - writeC(i); writeC(SevenSigns.getInstance().getSealOwner(i)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/MinionList.java index d31f7ac9fc..47d7eacad3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/MinionList.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.util; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; @@ -36,8 +35,6 @@ import com.l2jmobius.util.Rnd; */ public class MinionList { - private static final Logger _log = Logger.getLogger(MinionList.class.getName()); - protected final L2MonsterInstance _master; /** List containing the current spawned minions */ private final List _minionReferences = new CopyOnWriteArrayList<>(); @@ -348,11 +345,6 @@ public class MinionList minion.spawnMe(newX, newY, master.getZ()); - if (Config.DEBUG) - { - _log.info("Spawned minion template " + minion.getId() + " with objid: " + minion.getObjectId() + " to boss " + master.getObjectId() + " ,at: " + minion.getX() + " x, " + minion.getY() + " y, " + minion.getZ() + " z"); - } - return minion; } 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 51b7f9af79..3559130282 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 @@ -28,7 +28,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler; import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState; @@ -37,7 +36,6 @@ import com.l2jmobius.loginserver.network.loginserverpackets.InitLS; import com.l2jmobius.loginserver.network.loginserverpackets.KickPlayer; import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; import com.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters; -import com.l2jmobius.util.Util; import com.l2jmobius.util.crypt.NewCrypt; import com.l2jmobius.util.network.BaseSendablePacket; @@ -125,11 +123,6 @@ public class GameServerThread extends Thread return; } - if (Config.DEBUG) - { - _log.warning("[C]" + Config.EOL + Util.printData(data)); - } - L2JGameServerPacketHandler.handlePacket(data, this); } } @@ -236,10 +229,6 @@ public class GameServerThread extends Thread { final byte[] data = sl.getContent(); NewCrypt.appendChecksum(data); - if (Config.DEBUG) - { - _log.finest("[S] " + sl.getClass().getSimpleName() + ":" + Config.EOL + Util.printData(data)); - } _blowfish.crypt(data, 0, data.length); final int len = data.length + 2; 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 5faa28a78f..ec87387756 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 @@ -221,11 +221,6 @@ public class LoginController { if (rset.next()) { - if (Config.DEBUG) - { - _log.fine("Account '" + login + "' exists."); - } - final AccountInfo info = new AccountInfo(rset.getString("login"), rset.getString("password"), rset.getInt("accessLevel"), rset.getInt("lastServer")); if (!info.checkPassHash(hashBase64)) { 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 56b582a84b..16271c2336 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 @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.mmocore.MMOClient; import com.l2jmobius.commons.mmocore.MMOConnection; import com.l2jmobius.commons.mmocore.SendablePacket; @@ -263,11 +262,6 @@ public final class L2LoginClient extends MMOClient> @Override public void onDisconnection() { - if (Config.DEBUG) - { - _log.info("DISCONNECTED: " + toString()); - } - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); 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 33fda9972f..113796e392 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 @@ -22,7 +22,6 @@ import java.util.logging.Logger; import javax.crypto.Cipher; -import com.l2jmobius.Config; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState; import com.l2jmobius.util.crypt.NewCrypt; @@ -64,10 +63,6 @@ public class BlowFishKey extends BaseRecievePacket System.arraycopy(tempDecryptKey, i, key, 0, len - i); server.SetBlowFish(new NewCrypt(key)); - if (Config.DEBUG) - { - _log.info("New BlowFish key received, Blowfih Engine initialized:"); - } server.setLoginConnectionState(GameServerState.BF_CONNECTED); } catch (GeneralSecurityException 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 9f3aab78bc..8fcfbbaf81 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 @@ -78,19 +78,10 @@ public class GameServerAuth extends BaseRecievePacket _hosts[i] = readS(); } - if (Config.DEBUG) - { - _log.info("Auth request received"); - } - if (handleRegProcess()) { final AuthResponse ar = new AuthResponse(server.getGameServerInfo().getId()); server.sendPacket(ar); - if (Config.DEBUG) - { - _log.info("Authed: id: " + server.getGameServerInfo().getId()); - } server.broadcastToTelnet("GameServer [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId()) + " is connected"); server.setLoginConnectionState(GameServerState.AUTHED); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java index 80567e571a..b6946c6814 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.LoginController; import com.l2jmobius.loginserver.SessionKey; @@ -30,8 +27,6 @@ import com.l2jmobius.util.network.BaseRecievePacket; */ public class PlayerAuthRequest extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerAuthRequest.class.getName()); - /** * @param decrypt * @param server @@ -47,28 +42,14 @@ public class PlayerAuthRequest extends BaseRecievePacket final SessionKey sessionKey = new SessionKey(loginKey1, loginKey2, playKey1, playKey2); PlayerAuthResponse authResponse; - if (Config.DEBUG) - { - _log.info("auth request received for Player " + account); - } final SessionKey key = LoginController.getInstance().getKeyForAccount(account); if ((key != null) && key.equals(sessionKey)) { - if (Config.DEBUG) - { - _log.info("auth request: OK"); - } LoginController.getInstance().removeAuthedLoginClient(account); authResponse = new PlayerAuthResponse(account, true); } else { - if (Config.DEBUG) - { - _log.info("auth request: NO"); - _log.info("session key from self: " + key); - _log.info("session key sent: " + sessionKey); - } authResponse = new PlayerAuthResponse(account, false); } server.sendPacket(authResponse); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java index 4bebd754a5..ecc9773c8c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java @@ -16,10 +16,6 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.util.network.BaseRecievePacket; @@ -28,8 +24,6 @@ import com.l2jmobius.util.network.BaseRecievePacket; */ public class PlayerInGame extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerInGame.class.getName()); - /** * @param decrypt * @param server @@ -42,10 +36,6 @@ public class PlayerInGame extends BaseRecievePacket { final String account = readS(); server.addAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Account " + account + " logged in GameServer: [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } server.broadcastToTelnet("Account " + account + " logged in GameServer " + server.getServerId()); } } 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 dabcd1d227..f6be172fcd 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 @@ -18,8 +18,6 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.util.network.BaseRecievePacket; @@ -40,10 +38,6 @@ public class PlayerLogout extends BaseRecievePacket final String account = readS(); server.removeAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Player " + account + " logged out from gameserver [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } server.broadcastToTelnet("Player " + account + " disconnected from GameServer " + server.getServerId()); } 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 7701485d7d..062d65efee 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 @@ -18,7 +18,6 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.loginserver.LoginController; import com.l2jmobius.util.network.BaseRecievePacket; @@ -43,9 +42,5 @@ public class PlayerTracert extends BaseRecievePacket final String hop4 = readS(); LoginController.getInstance().setAccountLastTracert(account, pcIp, hop1, hop2, hop3, hop4); - if (Config.DEBUG) - { - _log.info("Saved " + account + " last tracert"); - } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 9d2f783e0e..fb38653977 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -18,8 +18,6 @@ package com.l2jmobius.loginserver.network.serverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; - /** * Fromat: d d: response */ @@ -33,10 +31,6 @@ public final class GGAuth extends L2LoginServerPacket public GGAuth(int response) { _response = response; - if (Config.DEBUG) - { - _log.warning("Reason Hex: " + Integer.toHexString(response)); - } } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini index 580f7c9a6a..d35c9e7b97 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini @@ -685,13 +685,6 @@ AllowReportsFromSameClanMembers = False # Do not touch these if you do not know what you are doing. # These settings are for debugging servers ONLY. They are not meant for LIVE servers. -# Default: False -Debug = False - -# Instances debugging -# Default: False -InstanceDebug = False - # Html action cache debugging # Default: False HtmlActionCacheDebug = False diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index add0fc00ce..d34b4302c7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -20,7 +20,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.data.xml.impl.AdminData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -93,10 +92,6 @@ public final class AdminChangeAccessLevel implements IAdminCommandHandler catch (SQLException se) { activeChar.sendMessage("SQLException while changing character's access level"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } } 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 44329091c0..7270939c1b 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 @@ -1193,10 +1193,6 @@ public class AdminEditChar implements IAdminCommandHandler sm.addInt(newReputation); player.sendPacket(sm); activeChar.sendMessage("Successfully Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ")."); - if (Config.DEBUG) - { - _log.finer("[SET KARMA] [GM]" + activeChar.getName() + " Changed karma for " + player.getName() + " from (" + oldReputation + ") to (" + newReputation + ")."); - } } private void editCharacter(L2PcInstance activeChar, String targetName) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index b6012bde39..33823c066e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.Arrays; import java.util.StringTokenizer; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.enums.Team; @@ -513,10 +512,6 @@ public class AdminEffects implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } } } else if (command.startsWith("admin_ave_abnormal")) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java index fdee3ec383..6f9c555c6f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java @@ -17,9 +17,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; */ public class AdminExpSp implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminExpSp.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_add_exp_sp_to_character", @@ -150,10 +146,6 @@ public class AdminExpSp implements IAdminCommandHandler player.addExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + "."); - } } return true; } @@ -197,10 +189,6 @@ public class AdminExpSp implements IAdminCommandHandler player.removeExpAndSp(expval, spval); // Admin information activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + "."); - } } return true; } 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 67a0476e48..5acf20c5b6 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 @@ -122,10 +122,6 @@ public class AdminHeal implements IAdminCommandHandler { target.setCurrentCp(target.getMaxCp()); } - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") healed character " + target.getName()); - } } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index e0b48d8b99..1fff955404 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class AdminInvul implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminInvul.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_invul", @@ -86,19 +82,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setIsInvul(false); text = activeChar.getName() + " is now mortal."; - if (Config.DEBUG) - { - _log.finer("GM: Gm removed invul mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setIsInvul(true); text = activeChar.getName() + " is now invulnerable."; - if (Config.DEBUG) - { - _log.finer("GM: Gm activated invul mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } @@ -110,19 +98,11 @@ public class AdminInvul implements IAdminCommandHandler { activeChar.setUndying(false); text = activeChar.getName() + " is now mortal."; - if (Config.DEBUG) - { - _log.finer("GM: Gm removed undying mode from character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } else { activeChar.setUndying(true); text = activeChar.getName() + " is now undying."; - if (Config.DEBUG) - { - _log.finer("GM: Gm activated undying mode for character " + activeChar.getName() + "(" + activeChar.getObjectId() + ")"); - } } activeChar.sendMessage(text); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 1519831ed1..4a5209e59f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -17,7 +17,6 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -36,7 +35,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class AdminKill implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminKill.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_kill", @@ -154,10 +152,6 @@ public class AdminKill implements IAdminCommandHandler target.setIsInvul(true); } } - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") killed character " + target.getObjectId()); - } } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java index 4db018597d..5f2dffa9d6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminRes.java @@ -16,9 +16,6 @@ */ package handlers.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; @@ -34,7 +31,6 @@ import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; */ public class AdminRes implements IAdminCommandHandler { - private static Logger _log = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_res", @@ -123,11 +119,6 @@ public class AdminRes implements IAdminCommandHandler } doResurrect((L2Character) obj); - - if (Config.DEBUG) - { - _log.finer("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") resurrected character " + obj.getObjectId()); - } } private void handleNonPlayerRes(L2PcInstance activeChar) 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 8a51638dd2..ea51fdd106 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 @@ -21,7 +21,6 @@ import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.ClassListData; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; @@ -538,10 +537,6 @@ public class AdminSkill implements IAdminCommandHandler player.sendSkillList(); // Admin info. activeChar.sendMessage("You gave the skill " + name + " to " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("[GM]" + activeChar.getName() + " gave skill " + name + " to " + player.getName() + "."); - } activeChar.sendSkillList(); } else @@ -573,10 +568,6 @@ public class AdminSkill implements IAdminCommandHandler player.removeSkill(skill); // Admin information activeChar.sendMessage("You removed the skill " + skillname + " from " + player.getName() + "."); - if (Config.DEBUG) - { - _log.finer("[GM]" + activeChar.getName() + " removed skill " + skillname + " from " + player.getName() + "."); - } activeChar.sendSkillList(); } else 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 7eda72c449..3f807d137a 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 @@ -23,7 +23,6 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.NpcData; @@ -135,10 +134,6 @@ public class AdminTeleport implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - _log.info("admin_walk: " + e); - } } } else if (command.startsWith("admin_move_to")) @@ -564,12 +559,6 @@ public class AdminTeleport implements IAdminCommandHandler spawn.init(); activeChar.sendMessage("Created " + template1.getName() + " on " + target.getObjectId() + "."); - - if (Config.DEBUG) - { - _log.finer("Spawn at X=" + spawn.getX() + " Y=" + spawn.getY() + " Z=" + spawn.getZ()); - _log.warning("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") moved NPC " + target.getObjectId()); - } } catch (Exception e) { 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 740b004b22..d6c31d5495 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 @@ -18,7 +18,6 @@ package handlers.bypasshandlers; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -85,11 +84,6 @@ public class PrivateWarehouse implements IBypassHandler } player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE)); - - if (Config.DEBUG) - { - _log.finer("Source: L2WarehouseInstance.java; Player: " + player.getName() + "; Command: showRetrieveWindow; Message: Showing stored items."); - } } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 0334844fe8..d195c3e64a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -17,7 +17,6 @@ package handlers.chathandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.ChatType; @@ -38,8 +37,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class ChatGeneral implements IChatHandler { - private static Logger _log = Logger.getLogger(ChatGeneral.class.getName()); - private static final ChatType[] CHAT_TYPES = { ChatType.GENERAL, @@ -63,10 +60,6 @@ public final class ChatGeneral implements IChatHandler else { command = text.substring(1); - if (Config.DEBUG) - { - _log.info("Command: " + command); - } } vch = VoicedCommandHandler.getInstance().getHandler(command); if (vch != null) @@ -76,10 +69,6 @@ public final class ChatGeneral implements IChatHandler } else { - if (Config.DEBUG) - { - _log.warning("No handler registered for bypass '" + command + "'"); - } vcd_used = false; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini index ab3643383b..b478b26176 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini @@ -125,11 +125,3 @@ LoginRestartSchedule = False # Time in hours. # Default: 24 LoginRestartTime = 24 - - -# --------------------------------------------------------------------------- -# Developer Settings -# --------------------------------------------------------------------------- - -# Default: False -Debug = False diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java index 13dfd58039..aeb6d74ce1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java @@ -419,8 +419,6 @@ public final class Config public static boolean SKILL_CHECK_ENABLE; public static boolean SKILL_CHECK_REMOVE; public static boolean SKILL_CHECK_GM; - public static boolean DEBUG; - public static boolean DEBUG_INSTANCES; public static boolean HTML_ACTION_CACHE_DEBUG; public static boolean PACKET_HANDLER_DEBUG; public static boolean DEVELOPER; @@ -1756,8 +1754,6 @@ public final class Config SKILL_CHECK_ENABLE = General.getBoolean("SkillCheckEnable", false); SKILL_CHECK_REMOVE = General.getBoolean("SkillCheckRemove", false); SKILL_CHECK_GM = General.getBoolean("SkillCheckGM", true); - DEBUG = General.getBoolean("Debug", false); - DEBUG_INSTANCES = General.getBoolean("InstanceDebug", false); HTML_ACTION_CACHE_DEBUG = General.getBoolean("HtmlActionCacheDebug", false); PACKET_HANDLER_DEBUG = General.getBoolean("PacketHandlerDebug", false); DEVELOPER = General.getBoolean("Developer", false); @@ -2774,8 +2770,6 @@ public final class Config DATAPACK_ROOT = new File("."); } - DEBUG = ServerSettings.getBoolean("Debug", false); - ACCEPT_NEW_GAMESERVER = ServerSettings.getBoolean("AcceptNewGameServer", true); LOGIN_TRY_BEFORE_BAN = ServerSettings.getInt("LoginTryBeforeBan", 5); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java index fc1fd57c3e..ee076bff4b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java @@ -23,7 +23,6 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.IGameXmlReader; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -42,6 +41,7 @@ public final class HitConditionBonusData implements IGameXmlReader private int highBonus = 0; private int lowBonus = 0; private int darkBonus = 0; + @SuppressWarnings("unused") private int rainBonus = 0; /** @@ -57,16 +57,6 @@ public final class HitConditionBonusData implements IGameXmlReader { parseDatapackFile("data/stats/hitConditionBonus.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded Hit Condition bonuses."); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Front bonus: " + frontBonus); - LOGGER.info(getClass().getSimpleName() + ": Side bonus: " + sideBonus); - LOGGER.info(getClass().getSimpleName() + ": Back bonus: " + backBonus); - LOGGER.info(getClass().getSimpleName() + ": High bonus: " + highBonus); - LOGGER.info(getClass().getSimpleName() + ": Low bonus: " + lowBonus); - LOGGER.info(getClass().getSimpleName() + ": Dark bonus: " + darkBonus); - LOGGER.info(getClass().getSimpleName() + ": Rain bonus: " + rainBonus); - } } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/AugmentationData.java index 08bd993847..5e23f8ad75 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/AugmentationData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/AugmentationData.java @@ -831,10 +831,6 @@ public class AugmentationData } stat12 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; resultColor=" + resultColor + "; level=" + lifeStoneLevel + "; grade=" + lifeStoneGrade); - } return new Augmentation(((stat34 << 16) + stat12)); } @@ -964,10 +960,6 @@ public class AugmentationData // stat12 has stats only stat12 = base + skillsLength + (ACC_STAT_SUBBLOCKSIZE * resultColor) + stat12; - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Accessory augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; level=" + lifeStoneLevel); - } final int augmentationId = ((stat34 << 16) + stat12); return getAugmentation(augmentationId); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/ItemTable.java index 8e700cdd85..4f74f2b04c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/ItemTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/ItemTable.java @@ -234,11 +234,6 @@ public class ItemTable } } - if (Config.DEBUG) - { - LOGGER.finer(getClass().getSimpleName() + ": Item created: " + item); - } - // Add the L2ItemInstance object to _allObjects of L2world L2World.getInstance().storeObject(item); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 0b8070e37b..d2b606a72a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -108,12 +108,6 @@ public final class CastleManorManager implements IGameXmlReader, IStorable { ThreadPoolManager.scheduleAtFixedRate(this::storeMe, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000, Config.ALT_MANOR_SAVE_PERIOD_RATE * 60 * 60 * 1000); } - - // Send debug message - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode); - } } else { @@ -435,10 +429,6 @@ public final class CastleManorManager implements IGameXmlReader, IStorable } } scheduleModeChange(); - if (Config.DEBUG) - { - LOGGER.info(getClass().getSimpleName() + ": Manor mode changed to " + _mode + "!"); - } } public final void setNextSeedProduction(List list, int castleId) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index c776c03a97..3149d5ff45 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -448,10 +448,6 @@ public final class InstanceManager implements IGameXmlReader { if (_currentInstanceId == Integer.MAX_VALUE) { - if (Config.DEBUG_INSTANCES) - { - LOGGER.info(getClass().getSimpleName() + ": Instance id owerflow, starting from zero."); - } _currentInstanceId = 0; } _currentInstanceId++; 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 0f821abc37..86a1a80e9b 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 @@ -472,11 +472,6 @@ public class CursedWeapon implements INamable public void saveData() { - if (Config.DEBUG) - { - _log.info("CursedWeapon: Saving data to disk."); - } - try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement del = con.prepareStatement("DELETE FROM cursed_weapons WHERE itemId = ?"); PreparedStatement ps = con.prepareStatement("INSERT INTO cursed_weapons (itemId, charId, playerReputation, playerPkKills, nbKills, endTime) VALUES (?, ?, ?, ?, ?, ?)")) 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 21dce65f39..8cca2c39b0 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 @@ -988,10 +988,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(9, getNewLeaderId()); ps.setInt(10, getId()); ps.execute(); - if (Config.DEBUG) - { - _log.finer("New clan leader saved in db: " + getId()); - } } catch (Exception e) { @@ -1033,10 +1029,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(12, getAllyCrestId()); ps.setInt(13, getNewLeaderId()); ps.execute(); - if (Config.DEBUG) - { - _log.finer("New clan saved in db: " + getId()); - } } catch (Exception e) { @@ -1061,10 +1053,6 @@ public class L2Clan implements IIdentifiable, INamable ps1.setLong(3, clanCreateExpiryTime); ps1.setInt(4, member.getObjectId()); ps1.execute(); - if (Config.DEBUG) - { - _log.finer("clan member removed in db: " + getId()); - } // Remove apprentice. ps2.setInt(1, member.getObjectId()); ps2.execute(); @@ -1142,11 +1130,6 @@ public class L2Clan implements IIdentifiable, INamable } } - if (Config.DEBUG && (getName() != null)) - { - _log.info("Restored clan data for \"" + getName() + "\" from database."); - } - restoreSubPledges(); restoreRankPrivs(); restoreSkills(); @@ -1910,11 +1893,6 @@ public class L2Clan implements IIdentifiable, INamable // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } - - if (Config.DEBUG) - { - _log.finer("New sub_clan saved in db: " + getId() + "; " + pledgeType); - } } catch (Exception e) { @@ -1980,10 +1958,6 @@ public class L2Clan implements IIdentifiable, INamable ps.setInt(3, getId()); ps.setInt(4, pledgeType); ps.execute(); - if (Config.DEBUG) - { - _log.finer("Subpledge updated in db: " + getId()); - } } catch (Exception e) { @@ -2428,11 +2402,6 @@ public class L2Clan implements IIdentifiable, INamable return; } - if (Config.DEBUG) - { - _log.finer(player.getObjectId() + "(" + player.getName() + ") requested ally creation from "); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); 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 55ebf4f5c1..f9aa07f44d 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 @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -104,10 +103,6 @@ public class L2DefenderInstance extends L2Attackable } if (!isInsideRadius(getSpawn(), 40, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); @@ -147,11 +142,6 @@ public class L2DefenderInstance extends L2Attackable // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - _log.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java index 4f7386ef47..b982a00c9f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; @@ -99,10 +98,6 @@ public class L2FortCommanderInstance extends L2DefenderInstance { if (!isInsideRadius(getSpawn(), 200, false, false)) { - if (Config.DEBUG) - { - _log.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java index fc636123fb..a7ec0202ed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -442,10 +442,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -493,10 +489,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Mp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -544,10 +536,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Exp editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -719,10 +707,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Tele editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); @@ -770,10 +754,6 @@ public class L2FortManagerInstance extends L2MerchantInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - _log.warning("Support editing invoked"); - } val = st.nextToken(); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-apply_confirmed.htm"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 6a94be63b5..214c883f17 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; */ public class L2GuardInstance extends L2Attackable { - private static Logger _log = Logger.getLogger(L2GuardInstance.class.getName()); - /** * Constructor of L2GuardInstance (use L2Character and L2NpcInstance constructor).
* Actions : @@ -172,11 +168,6 @@ public class L2GuardInstance extends L2Attackable // Check if the L2PcInstance is in the _aggroList of the L2GuardInstance if (containsTarget(player)) { - if (Config.DEBUG) - { - _log.finer(player.getObjectId() + ": Attacked guard " + getObjectId()); - } - // Set the L2PcInstance Intention to AI_INTENTION_ATTACK player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index 11f2e21933..ed9aab530f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.List; import java.util.Map; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.model.L2SkillLearn; @@ -61,11 +60,6 @@ public class L2NpcInstance extends L2Npc */ public static void showSkillList(L2PcInstance player, L2Npc npc, ClassId classId) { - if (Config.DEBUG) - { - _log.finer("SkillList activated on: " + npc.getObjectId()); - } - final int npcId = npc.getTemplate().getId(); if (npcId == 32611) // Tolonis (Officer) { 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 7a4b9ea552..0627df46b1 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 @@ -3856,20 +3856,11 @@ public final class L2PcInstance extends L2Playable final L2Summon pet = getPet(); if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return null; } if (isProcessingItem(objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return null; } @@ -10514,20 +10505,11 @@ public final class L2PcInstance extends L2Playable final L2Summon pet = getPet(); if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return false; } if (isProcessingItem(objectId)) { - if (Config.DEBUG) - { - _log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } return false; } 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 9494559d7d..9af40f494e 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 @@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -207,11 +206,6 @@ public class CharStatus { if ((_regTask == null) && !getActiveChar().isDead()) { - if (Config.DEBUG) - { - _log.finer("HP/MP regen started"); - } - // Get the Regeneration period final int period = Formulas.getRegeneratePeriod(getActiveChar()); @@ -232,11 +226,6 @@ public class CharStatus { if (_regTask != null) { - if (Config.DEBUG) - { - _log.finer("HP/MP regen stop"); - } - // Stop the HP/MP/CP Regeneration task _regTask.cancel(false); _regTask = null; 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 d38ef03cf0..fc216cf183 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 @@ -24,7 +24,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.NpcData; @@ -307,11 +306,6 @@ public final class BlockCheckerEngine _abnormalEnd = true; ThreadPoolManager.execute(new EndEvent()); - - if (Config.DEBUG) - { - _log.info("Handys Block Checker Event at arena " + _arena + " ended due lack of players!"); - } } } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index 232944b028..77c2468437 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -128,12 +128,6 @@ public final class Instance implements IIdentifiable, INamable // Notify DP scripts EventDispatcher.getInstance().notifyEventAsync(new OnInstanceCreated(this, player), _template); } - - // Debug logger - if (Config.DEBUG_INSTANCES) - { - LOGGER.info("Instance " + _template.getName() + " (" + _template.getId() + ") has been created with instance id " + getId()); - } } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 679ddd1b8f..49cd83dca6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1327,11 +1327,6 @@ public abstract class Inventory extends ItemContainer */ public L2ItemInstance unEquipItemInBodySlot(int slot) { - if (Config.DEBUG) - { - LOGGER.info("Unequip body slot: " + slot); - } - int pdollSlot = -1; switch (slot) 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 8c4ba4eb64..8e4641502a 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 @@ -264,10 +264,6 @@ public final class Skill implements IIdentifiable if (Config.ENABLE_MODIFY_SKILL_REUSE && Config.SKILL_REUSE_LIST.containsKey(_id)) { - if (Config.DEBUG) - { - _log.info("*** Skill " + _name + " (" + _level + ") changed reuse from " + set.getInt("reuseDelay", 0) + " to " + Config.SKILL_REUSE_LIST.get(_id) + " seconds."); - } _reuseDelay = Config.SKILL_REUSE_LIST.get(_id); } else 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 f0fc7726d3..65ee4bbc41 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 @@ -170,10 +170,6 @@ public final class L2GameClient extends ChannelInboundHandler @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - if (Config.DEBUG) - { - LOGGER.log(Level.WARNING, "Network exception caught for: " + toString(), cause); - } } public Channel getChannel() 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 ccd2d1d13a..f92d2c5e23 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 @@ -32,8 +32,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; public final class Action implements IClientIncomingPacket { private int _objectId; + @SuppressWarnings("unused") private int _originX; + @SuppressWarnings("unused") private int _originY; + @SuppressWarnings("unused") private int _originZ; private int _actionId; @@ -51,11 +54,6 @@ public final class Action implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (Config.DEBUG) - { - _log.info(getClass().getSimpleName() + ": " + (_actionId == 0 ? "Simple-click" : "Shift-click") + " Target object ID: " + _objectId + " orignX: " + _originX + " orignY: " + _originY + " orignZ: " + _originZ); - } - // Get the current L2PcInstance of the player final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 8890047012..22dfca0017 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.LoginServerThread; import com.l2jmobius.gameserver.LoginServerThread.SessionKey; @@ -60,11 +59,6 @@ public final class AuthLogin implements IClientIncomingPacket } final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2); - if (Config.DEBUG) - { - _log.info("user:" + _loginName); - _log.info("key:" + key); - } // avoid potential exploits if (client.getAccountName() == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 7f9cb857c7..f202f197b2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.model.Location; @@ -53,10 +52,6 @@ public final class CannotMoveAnymore implements IClientIncomingPacket return; } - if (Config.DEBUG) - { - _log.finer("client: x:" + _x + " y:" + _y + " z:" + _z + " server x:" + player.getX() + " y:" + player.getY() + " z:" + player.getZ()); - } if (player.getAI() != null) { player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading)); 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 06464d9911..f530aead0c 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 @@ -92,11 +92,6 @@ public final class CharacterCreate implements IClientIncomingPacket // Last Verified: May 30, 2009 - Gracia Final - Players are able to create characters with names consisting of as little as 1,2,3 letter/number combinations. if ((_name.length() < 1) || (_name.length() > 16)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Your title cannot exceed 16 characters in length. Please try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS)); return; } @@ -122,11 +117,6 @@ public final class CharacterCreate implements IClientIncomingPacket // Last Verified: May 30, 2009 - Gracia Final if (!Util.isAlphaNumeric(_name) || !isValidName(_name)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Character name " + _name + " is invalid. Message generated: Incorrect name. Please try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_INCORRECT_NAME)); return; } @@ -165,21 +155,11 @@ public final class CharacterCreate implements IClientIncomingPacket { if ((CharNameTable.getInstance().getAccountCharacterCount(client.getAccountName()) >= Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT) && (Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT != 0)) { - if (Config.DEBUG) - { - _log.finer("Max number of characters reached. Creation failed."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_TOO_MANY_CHARACTERS)); return; } else if (CharNameTable.getInstance().doesCharNameExist(_name)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: Message generated: You cannot create another character. Please delete the existing character and try again."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS)); return; } @@ -187,11 +167,6 @@ public final class CharacterCreate implements IClientIncomingPacket template = PlayerTemplateData.getInstance().getTemplate(_classId); if ((template == null) || (ClassId.getClassId(_classId).level() > 0)) { - if (Config.DEBUG) - { - _log.finer("Character Creation Failure: " + _name + " classId: " + _classId + " Template: " + template + " Message generated: Your character creation has failed."); - } - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -286,11 +261,6 @@ public final class CharacterCreate implements IClientIncomingPacket private void initNewChar(L2GameClient client, L2PcInstance newChar) { - if (Config.DEBUG) - { - _log.finer("Character init start"); - } - L2World.getInstance().storeObject(newChar); if (Config.STARTING_ADENA > 0) @@ -350,11 +320,6 @@ public final class CharacterCreate implements IClientIncomingPacket for (L2SkillLearn skill : SkillTreesData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true)) { - if (Config.DEBUG) - { - _log.finer("Adding starter skill:" + skill.getSkillId() + " / " + skill.getSkillLevel()); - } - newChar.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true); } @@ -372,10 +337,5 @@ public final class CharacterCreate implements IClientIncomingPacket final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1); client.setCharSelection(cl.getCharInfo()); - - if (Config.DEBUG) - { - _log.finer("Character init end"); - } } } 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 bf1369b884..cd62eefdba 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 @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Level; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.enums.CharacterDeleteFailType; import com.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -55,11 +54,6 @@ public final class CharacterDelete implements IClientIncomingPacket // return; // } - if (Config.DEBUG) - { - _log.finer("deleting slot:" + _charSlot); - } - try { final CharacterDeleteFailType failType = client.markToDeleteChar(_charSlot); 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 9a3530ea8c..579b270fb4 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 @@ -145,12 +145,6 @@ public class CharacterSelect implements IClientIncomingPacket } } - // The L2PcInstance must be created here, so that it can be attached to the L2GameClient - if (Config.DEBUG) - { - _log.finer("selected slot:" + _charSlot); - } - // load up character from disk final L2PcInstance cha = client.loadCharFromDisk(_charSlot); if (cha == null) 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 e6938bda6d..9321940795 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 @@ -168,13 +168,10 @@ public class EnterWorld implements IClientIncomingPacket vars.remove("INSTANCE_RESTORE"); } - if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) - { - if (Config.DEBUG) - { - _log.warning("User already exists in Object ID map! User " + activeChar.getName() + " is a character clone."); - } - } + // if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) + // { + // _log.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/RequestDropItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index f11a357d3e..04b62b31bf 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 @@ -149,20 +149,12 @@ public final class RequestDropItem implements IClientIncomingPacket if ((L2Item.TYPE2_QUEST == item.getItem().getType2()) && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ":player tried to drop quest item"); - } activeChar.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED_OR_EXCHANGED); return; } if (!activeChar.isInsideRadius(_x, _y, 0, 150, false, false) || (Math.abs(_z - activeChar.getZ()) > 50)) { - if (Config.DEBUG) - { - _log.finest(activeChar.getObjectId() + ": trying to drop too far away"); - } activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DISCARD_SOMETHING_THAT_FAR_AWAY_FROM_YOU); return; } @@ -173,11 +165,6 @@ public final class RequestDropItem implements IClientIncomingPacket return; } - if (Config.DEBUG) - { - _log.finer("requested drop item " + _objectId + "(" + item.getCount() + ") at " + _x + "/" + _y + "/" + _z); - } - if (item.isEquipped()) { activeChar.getInventory().unEquipItemInSlot(item.getLocationSlot()); @@ -187,11 +174,6 @@ public final class RequestDropItem implements IClientIncomingPacket final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); - if (Config.DEBUG) - { - _log.finer("dropping " + _objectId + " item(" + _count + ") at: " + _x + " " + _y + " " + _z); - } - // activeChar.broadcastUserInfo(); if (activeChar.isGM()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java index ee8bcd656b..c1d19b5e5b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData; @@ -193,11 +192,6 @@ public final class RequestDuelStart implements IClientIncomingPacket activeChar.onTransactionRequest(partyLeader); partyLeader.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.finer(activeChar.getName() + " requested a duel with " + partyLeader.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(partyLeader.getName()); activeChar.sendPacket(msg); @@ -222,11 +216,6 @@ public final class RequestDuelStart implements IClientIncomingPacket activeChar.onTransactionRequest(targetChar); targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - _log.finer(activeChar.getName() + " requested a duel with " + targetChar.getName()); - } - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(targetChar.getName()); activeChar.sendPacket(msg); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java index 2da3b56c0b..d92531c7f1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.L2Clan; @@ -48,10 +47,6 @@ public final class RequestPledgeInfo implements IClientIncomingPacket final L2Clan clan = ClanTable.getInstance().getClan(_clanId); if (clan == null) { - if (Config.DEBUG) - { - _log.warning(getClass().getSimpleName() + ": Clan data for clanId " + _clanId + " is missing for player " + activeChar); - } return; // we have no clan data ?!? should not happen } 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 de928603c2..a1fdeb2cf3 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 @@ -67,11 +67,6 @@ public final class RequestRestart implements IClientIncomingPacket if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && Config.GM_RESTART_FIGHTING)) { - if (Config.DEBUG) - { - _log.finer("Player " + player.getName() + " tried to logout while fighting."); - } - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTART_WHILE_IN_COMBAT); client.sendPacket(RestartResponse.FALSE); return; 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 9ddb2d5222..281601ab37 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 @@ -99,11 +99,6 @@ public final class Say2 implements IClientIncomingPacket @Override public void run(L2GameClient client) { - if (Config.DEBUG) - { - _log.info("Say2: Msg Type = '" + _type + "' Text = '" + _text + "'."); - } - final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java index c4fad94c0e..c9d9242f10 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.TradeList; @@ -56,10 +55,6 @@ public final class TradeDone implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - if (Config.DEBUG) - { - _log.warning("player.getTradeList == null in " + getClass().getSimpleName() + " for player " + player.getName()); - } return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 5d7e35eb43..09c1d6ea32 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -195,10 +195,6 @@ public final class TradeRequest implements IClientIncomingPacket if (player.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.finer("Already trading with someone else."); - } client.sendPacket(SystemMessageId.YOU_ARE_ALREADY_TRADING_WITH_SOMEONE); return; } @@ -206,10 +202,6 @@ public final class TradeRequest implements IClientIncomingPacket SystemMessage sm; if (partner.isProcessingRequest() || partner.isProcessingTransaction()) { - if (Config.DEBUG) - { - _log.info("Transaction already in progress."); - } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); sm.addString(partner.getName()); client.sendPacket(sm); 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 602093c8ae..0a55aaab22 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 @@ -281,10 +281,6 @@ public final class UseItem implements IClientIncomingPacket { _log.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } - else if (Config.DEBUG) - { - _log.warning("No Item handler registered for Item Id: " + _itemId + "!"); - } } else if (handler.useItem(activeChar, item, _ctrlPressed)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/MinionList.java index 22ba27c49f..eafbd496c3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/MinionList.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.util; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; @@ -35,8 +34,6 @@ import com.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private static final Logger _log = Logger.getLogger(MinionList.class.getName()); - protected final L2MonsterInstance _master; /** List containing the current spawned minions */ private final List _minionReferences = new CopyOnWriteArrayList<>(); @@ -385,11 +382,6 @@ public class MinionList minion.spawnMe(newX, newY, master.getZ()); - if (Config.DEBUG) - { - _log.info("Spawned minion template " + minion.getId() + " with objid: " + minion.getObjectId() + " to boss " + master.getObjectId() + " ,at: " + minion.getX() + " x, " + minion.getY() + " y, " + minion.getZ() + " z"); - } - return minion; } 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 22595d5182..d1e9b5d9b6 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 @@ -28,8 +28,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -import com.l2jmobius.Config; -import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.commons.util.network.BaseSendablePacket; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -125,11 +123,6 @@ public class GameServerThread extends Thread return; } - if (Config.DEBUG) - { - _log.warning("[C]" + Config.EOL + CommonUtil.printData(data)); - } - L2JGameServerPacketHandler.handlePacket(data, this); } } @@ -235,10 +228,6 @@ public class GameServerThread extends Thread { final byte[] data = sl.getContent(); NewCrypt.appendChecksum(data); - if (Config.DEBUG) - { - _log.finest("[S] " + sl.getClass().getSimpleName() + ":" + Config.EOL + CommonUtil.printData(data)); - } _blowfish.crypt(data, 0, data.length); final int len = data.length + 2; 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 b7865426f2..5adfc93535 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 @@ -223,11 +223,6 @@ public class LoginController { if (rset.next()) { - if (Config.DEBUG) - { - _log.finer("Account '" + login + "' exists."); - } - final AccountInfo info = new AccountInfo(rset.getString("login"), rset.getString("password"), rset.getInt("accessLevel"), rset.getInt("lastServer")); if (!info.checkPassHash(hashBase64)) { 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 da92f648a0..17599078af 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 @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.crypt.LoginCrypt; import com.l2jmobius.commons.util.crypt.ScrambledKeyPair; @@ -261,11 +260,6 @@ public final class L2LoginClient extends MMOClient> @Override public void onDisconnection() { - if (Config.DEBUG) - { - _log.info("DISCONNECTED: " + toString()); - } - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); 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 ee08b6fc80..9be997f496 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 @@ -22,7 +22,6 @@ import java.util.logging.Logger; import javax.crypto.Cipher; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; @@ -64,10 +63,6 @@ public class BlowFishKey extends BaseRecievePacket System.arraycopy(tempDecryptKey, i, key, 0, len - i); server.SetBlowFish(new NewCrypt(key)); - if (Config.DEBUG) - { - _log.info("New BlowFish key received, Blowfih Engine initialized:"); - } server.setLoginConnectionState(GameServerState.BF_CONNECTED); } catch (GeneralSecurityException 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 41571dfac2..4d8945a63d 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 @@ -78,19 +78,10 @@ public class GameServerAuth extends BaseRecievePacket _hosts[i] = readS(); } - if (Config.DEBUG) - { - _log.info("Auth request received"); - } - if (handleRegProcess()) { final AuthResponse ar = new AuthResponse(server.getGameServerInfo().getId()); server.sendPacket(ar); - if (Config.DEBUG) - { - _log.info("Authed: id: " + server.getGameServerInfo().getId()); - } server.setLoginConnectionState(GameServerState.AUTHED); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java index 9d365d85c1..3ce8993621 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.LoginController; @@ -30,8 +27,6 @@ import com.l2jmobius.loginserver.network.loginserverpackets.PlayerAuthResponse; */ public class PlayerAuthRequest extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerAuthRequest.class.getName()); - /** * @param decrypt * @param server @@ -47,28 +42,14 @@ public class PlayerAuthRequest extends BaseRecievePacket final SessionKey sessionKey = new SessionKey(loginKey1, loginKey2, playKey1, playKey2); PlayerAuthResponse authResponse; - if (Config.DEBUG) - { - _log.info("auth request received for Player " + account); - } final SessionKey key = LoginController.getInstance().getKeyForAccount(account); if ((key != null) && key.equals(sessionKey)) { - if (Config.DEBUG) - { - _log.info("auth request: OK"); - } LoginController.getInstance().removeAuthedLoginClient(account); authResponse = new PlayerAuthResponse(account, true); } else { - if (Config.DEBUG) - { - _log.info("auth request: NO"); - _log.info("session key from self: " + key); - _log.info("session key sent: " + sessionKey); - } authResponse = new PlayerAuthResponse(account, false); } server.sendPacket(authResponse); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java index b90ecefded..420e245412 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java @@ -16,11 +16,7 @@ */ package com.l2jmobius.loginserver.network.gameserverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; /** @@ -28,8 +24,6 @@ import com.l2jmobius.loginserver.GameServerThread; */ public class PlayerInGame extends BaseRecievePacket { - private static Logger _log = Logger.getLogger(PlayerInGame.class.getName()); - /** * @param decrypt * @param server @@ -42,10 +36,6 @@ public class PlayerInGame extends BaseRecievePacket { final String account = readS(); server.addAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Account " + account + " logged in GameServer: [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } } } } 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 272414ef91..51f1c8a96e 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 @@ -18,9 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; -import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerThread; /** @@ -40,9 +38,5 @@ public class PlayerLogout extends BaseRecievePacket final String account = readS(); server.removeAccountOnGameServer(account); - if (Config.DEBUG) - { - _log.info("Player " + account + " logged out from gameserver [" + server.getServerId() + "] " + GameServerTable.getInstance().getServerNameById(server.getServerId())); - } } } 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 5dd853031a..341c0a3a8c 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 @@ -18,7 +18,6 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.network.BaseRecievePacket; import com.l2jmobius.loginserver.LoginController; @@ -43,9 +42,5 @@ public class PlayerTracert extends BaseRecievePacket final String hop4 = readS(); LoginController.getInstance().setAccountLastTracert(account, pcIp, hop1, hop2, hop3, hop4); - if (Config.DEBUG) - { - _log.info("Saved " + account + " last tracert"); - } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 9d2f783e0e..fb38653977 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -18,8 +18,6 @@ package com.l2jmobius.loginserver.network.serverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; - /** * Fromat: d d: response */ @@ -33,10 +31,6 @@ public final class GGAuth extends L2LoginServerPacket public GGAuth(int response) { _response = response; - if (Config.DEBUG) - { - _log.warning("Reason Hex: " + Integer.toHexString(response)); - } } @Override