diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Developer.ini b/L2J_Mobius_C6_Interlude/dist/game/config/main/Developer.ini index e8b50ca583..13f6640adb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/config/main/Developer.ini +++ b/L2J_Mobius_C6_Interlude/dist/game/config/main/Developer.ini @@ -24,12 +24,7 @@ AltDevNoRB = False #------------------------------------------- # Additional server settings #------------------------------------------- -Debug = False -ZoneDebug = False Assert = False -Developer = False -# Log to debug skills with formula calculation -SkillsDebug = False # if true the server will be a test server (listed by test server clients only) TestServer = False diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java index 070dbfdf73..524cd6baab 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java @@ -330,10 +330,6 @@ public class VanHalter extends Quest rset.close(); statement.close(); - if (Config.DEBUG) - { - LOGGER.info("VanHalterManager.loadRoyalGuard: Loaded " + _royalGuardSpawn.size() + " Royal Guard spawn locations."); - } } catch (Exception e) { @@ -405,10 +401,6 @@ public class VanHalter extends Quest rset.close(); statement.close(); - if (Config.DEBUG) - { - LOGGER.info("VanHalterManager.loadTriolRevelation: Loaded " + _triolRevelationSpawn.size() + " Triol's Revelation spawn locations."); - } } catch (Exception e) { @@ -483,10 +475,6 @@ public class VanHalter extends Quest rset.close(); statement.close(); - if (Config.DEBUG) - { - LOGGER.info("VanHalterManager.loadRoyalGuardCaptain: Loaded " + _royalGuardCaptainSpawn.size() + " Royal Guard Captain spawn locations."); - } } catch (Exception e) { @@ -558,10 +546,6 @@ public class VanHalter extends Quest rset.close(); statement.close(); - if (Config.DEBUG) - { - LOGGER.info("VanHalterManager.loadRoyalGuardHelper: Loaded " + _royalGuardHelperSpawn.size() + " Royal Guard Helper spawn locations."); - } } catch (Exception e) { @@ -626,10 +610,6 @@ public class VanHalter extends Quest rset.close(); statement.close(); - if (Config.DEBUG) - { - LOGGER.info("VanHalterManager.loadGuardOfAltar: Loaded " + _guardOfAltarSpawn.size() + " Guard Of Altar spawn locations."); - } } catch (Exception e) { @@ -700,10 +680,6 @@ public class VanHalter extends Quest rset.close(); statement.close(); - if (Config.DEBUG) - { - LOGGER.info("VanHalterManager.loadVanHalter: Loaded High Priestess van Halter spawn locations."); - } } catch (Exception e) { @@ -765,10 +741,6 @@ public class VanHalter extends Quest rset.close(); statement.close(); - if (Config.DEBUG) - { - LOGGER.info("VanHalterManager.loadRitualOffering: Loaded Ritual Offering spawn locations."); - } } catch (Exception e) { @@ -831,10 +803,6 @@ public class VanHalter extends Quest rset.close(); statement.close(); - if (Config.DEBUG) - { - LOGGER.info("VanHalterManager.loadRitualSacrifice: Loaded Ritual Sacrifice spawn locations."); - } } catch (Exception e) { diff --git a/L2J_Mobius_C6_Interlude/dist/login/config/network/LoginServer.ini b/L2J_Mobius_C6_Interlude/dist/login/config/network/LoginServer.ini index d34882f029..8dde295768 100644 --- a/L2J_Mobius_C6_Interlude/dist/login/config/network/LoginServer.ini +++ b/L2J_Mobius_C6_Interlude/dist/login/config/network/LoginServer.ini @@ -116,17 +116,10 @@ ForceGGAuth = False # IMPORTANT: Put True for server security. EnableFloodProtection = True -# Enable mode "debugging" -# With debug you will see more log on console and more messages in game. -Debug = False - -# Switched on "development" -Developer = False - # ============================================================= # Anti Bruteforce protection. (credits RT-Interlude) # ============================================================= -#Count of trying connection to server, after which will be made checking IP addres +#Count of trying connection to server, after which will be made checking IP address #for a possible BrutForce #Reducing this value will increase the likelihood of false positives #Increasing this value will reduce the effectiveness of security (more chance find passwords for large accounts) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java index d2faf7aa13..b0fce9eb3f 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java @@ -641,11 +641,7 @@ public final class Config public static boolean ALT_DEV_NO_SPAWNS; public static boolean ALT_DEV_NO_SCRIPT; public static boolean ALT_DEV_NO_RB; - public static boolean SKILLSDEBUG; - public static boolean DEBUG; public static boolean ASSERT; - public static boolean DEVELOPER; - public static boolean ZONE_DEBUG; public static boolean SERVER_LIST_TESTSERVER; public static boolean BETASERVER; public static boolean SERVER_LIST_BRACKET; @@ -2300,11 +2296,7 @@ public final class Config devSettings.load(is); is.close(); - SKILLSDEBUG = Boolean.parseBoolean(devSettings.getProperty("SkillsDebug", "false")); - DEBUG = Boolean.parseBoolean(devSettings.getProperty("Debug", "false")); ASSERT = Boolean.parseBoolean(devSettings.getProperty("Assert", "false")); - DEVELOPER = Boolean.parseBoolean(devSettings.getProperty("Developer", "false")); - ZONE_DEBUG = Boolean.parseBoolean(devSettings.getProperty("ZoneDebug", "false")); SERVER_LIST_TESTSERVER = Boolean.parseBoolean(devSettings.getProperty("TestServer", "false")); BETASERVER = Boolean.parseBoolean(devSettings.getProperty("BetaServer", "false")); SERVER_LIST_BRACKET = Boolean.valueOf(devSettings.getProperty("ServerListBrackets", "false")); @@ -3815,8 +3807,6 @@ public final class Config NORMAL_CONNECTION_TIME = Integer.parseInt(serverSettings.getProperty("NormalConnectionTime", "700")); FAST_CONNECTION_TIME = Integer.parseInt(serverSettings.getProperty("FastConnectionTime", "350")); MAX_CONNECTION_PER_IP = Integer.parseInt(serverSettings.getProperty("MaxConnectionPerIP", "50")); - DEBUG = Boolean.parseBoolean(serverSettings.getProperty("Debug", "false")); - DEVELOPER = Boolean.parseBoolean(serverSettings.getProperty("Developer", "false")); NETWORK_IP_LIST = serverSettings.getProperty("NetworkList", ""); SESSION_TTL = Long.parseLong(serverSettings.getProperty("SessionTTL", "25000")); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/crypt/nProtect.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/crypt/nProtect.java index dd145e0a23..7ece146dd0 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/crypt/nProtect.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/crypt/nProtect.java @@ -19,9 +19,7 @@ package com.l2jmobius.commons.crypt; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.concurrent.ScheduledFuture; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.serverpackets.GameGuardQuery; @@ -32,8 +30,6 @@ import com.l2jmobius.gameserver.network.serverpackets.GameGuardQuery; */ public class nProtect { - private static Logger LOGGER = Logger.getLogger(nProtect.class.getName()); - public enum RestrictionType { RESTRICT_ENTER, @@ -117,10 +113,7 @@ public class nProtect } catch (ClassNotFoundException e) { - if (Config.DEBUG) - { - LOGGER.warning("nProtect System will be not loaded due to ClassNotFoundException of 'com.l2jmobius.protection.main' class"); - } + // LOGGER.warning("nProtect System will be not loaded due to ClassNotFoundException of 'com.l2jmobius.protection.main' class"); } catch (SecurityException | InvocationTargetException | IllegalAccessException | IllegalArgumentException | NoSuchMethodException e) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/util/object/L2ObjectHashSet.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/util/object/L2ObjectHashSet.java index 743c816908..dd6f5bf5e8 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/util/object/L2ObjectHashSet.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/util/object/L2ObjectHashSet.java @@ -35,7 +35,6 @@ public final class L2ObjectHashSetextends L2ObjectSet protected static final Logger LOGGER = Logger.getLogger(L2ObjectHashSet.class.getName()); private static final boolean TRACE = false; - private static final boolean DEBUG = Config.DEBUG; private static final int[] PRIMES = { @@ -135,36 +134,20 @@ public final class L2ObjectHashSetextends L2ObjectSet final int size = PRIMES[0]; _table = (T[]) new L2Object[size]; _collisions = new int[(size + 31) >> 5]; - if (DEBUG) - { - check(); - } } - /* - * (non-Javadoc) - * @see com.l2jmobius.util.L2ObjectSet#size() - */ @Override public int size() { return _count; } - /* - * (non-Javadoc) - * @see com.l2jmobius.util.L2ObjectSet#isEmpty() - */ @Override public boolean isEmpty() { return _count == 0; } - /* - * (non-Javadoc) - * @see com.l2jmobius.util.L2ObjectSet#clear() - */ @Override @SuppressWarnings("unchecked") public synchronized void clear() @@ -173,33 +156,8 @@ public final class L2ObjectHashSetextends L2ObjectSet _table = (T[]) new L2Object[size]; _collisions = new int[(size + 31) >> 5]; _count = 0; - if (DEBUG) - { - check(); - } } - private void check() - { - if (DEBUG) - { - int cnt = 0; - assert _collisions.length == ((_table.length + 31) >> 5); - for (T obj : _table) - { - if (obj != null) - { - cnt++; - } - } - assert cnt == _count; - } - } - - /* - * (non-Javadoc) - * @see com.l2jmobius.util.L2ObjectSet#put(T) - */ @Override public synchronized void put(T obj) { @@ -243,10 +201,6 @@ public final class L2ObjectHashSetextends L2ObjectSet { LOGGER.warning("ht: put obj id=" + hashcode + " at slot=" + slot); } - if (DEBUG) - { - check(); - } return; } } @@ -272,10 +226,6 @@ public final class L2ObjectHashSetextends L2ObjectSet { LOGGER.warning("ht: put obj id=" + hashcode + " at slot=" + slot); } - if (DEBUG) - { - check(); - } return; } } @@ -286,17 +236,10 @@ public final class L2ObjectHashSetextends L2ObjectSet seed += incr; } while (++ntry < _table.length); - if (DEBUG) - { - check(); - } + throw new IllegalStateException(); } - /* - * (non-Javadoc) - * @see com.l2jmobius.util.L2ObjectSet#remove(T) - */ @Override public synchronized void remove(T obj) { @@ -328,29 +271,18 @@ public final class L2ObjectHashSetextends L2ObjectSet { LOGGER.warning("ht: remove obj id=" + hashcode + " from slot=" + pos); } - if (DEBUG) - { - check(); - } return; } // check for collision (if we previously deleted element) if ((_table[pos] == null) && ((_collisions[pos >> 5] & (1 << (pos & 31))) == 0)) { - if (DEBUG) - { - check(); - } return; // throw new IllegalArgumentException(); } // calculate next slot seed += incr; } while (++ntry < _table.length); - if (DEBUG) - { - check(); - } + throw new IllegalStateException(); } @@ -444,16 +376,8 @@ public final class L2ObjectHashSetextends L2ObjectSet } _table = (T[]) newTable; _collisions = newCollisions; - if (DEBUG) - { - check(); - } } - /* - * (non-Javadoc) - * @see com.l2jmobius.util.L2ObjectSet#iterator() - */ @Override public Iterator iterator() { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/TradeController.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/TradeController.java index 0500e1c894..9fa361af00 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/TradeController.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/TradeController.java @@ -27,7 +27,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.StringTokenizer; import java.util.logging.Logger; import com.l2jmobius.Config; @@ -94,8 +93,6 @@ public class TradeController { LOGGER.warning("Do, please, remove buylists from data folder and use SQL buylist instead"); String line = null; - int dummyItemCount = 0; - FileReader reader = null; BufferedReader buff = null; LineNumberReader lnr = null; @@ -112,12 +109,6 @@ public class TradeController { continue; } - dummyItemCount += parseList(line); - } - - if (Config.DEBUG) - { - LOGGER.info("created " + dummyItemCount + " Dummy-Items for buylists"); } LOGGER.info("TradeController: Loaded " + _lists.size() + " Buylists."); @@ -172,7 +163,6 @@ public class TradeController /** * Initialize Shop buylist */ - int dummyItemCount = 0; boolean LimitedItem = false; try (Connection con = DatabaseFactory.getConnection()) @@ -190,7 +180,6 @@ public class TradeController if (rset.next()) { LimitedItem = false; - dummyItemCount++; L2TradeList buy1 = new L2TradeList(rset1.getInt("shop_id")); int itemId = rset.getInt("item_id"); @@ -240,7 +229,6 @@ public class TradeController { while (rset.next()) // TODO aici { - dummyItemCount++; itemId = rset.getInt("item_id"); price = rset.getInt("price"); count = rset.getInt("count"); @@ -302,13 +290,9 @@ public class TradeController rset1.close(); statement1.close(); - if (Config.DEBUG) - { - LOGGER.info("created " + dummyItemCount + " Dummy-Items for buylists"); - } - LOGGER.info("TradeController: Loaded " + _lists.size() + " Buylists."); LOGGER.info("TradeController: Loaded " + _listsTaskItem.size() + " Limited Buylists."); + /* * Restore Task for reinitialyze count of buy item */ @@ -373,7 +357,6 @@ public class TradeController if (rset.next()) { LimitedItem = false; - dummyItemCount++; L2TradeList buy1 = new L2TradeList(rset1.getInt("shop_id")); int itemId = rset.getInt("item_id"); int price = rset.getInt("price"); @@ -420,7 +403,6 @@ public class TradeController { while (rset.next()) { - dummyItemCount++; itemId = rset.getInt("item_id"); price = rset.getInt("price"); count = rset.getInt("count"); @@ -478,11 +460,6 @@ public class TradeController rset1.close(); statement1.close(); - if (Config.DEBUG) - { - LOGGER.info("created " + dummyItemCount + " Dummy-Items for buylists"); - } - LOGGER.info("TradeController: Loaded " + (_lists.size() - initialSize) + " Custom Buylists."); /** @@ -529,34 +506,6 @@ public class TradeController } } - private int parseList(String line) - { - int itemCreated = 0; - StringTokenizer st = new StringTokenizer(line, ";"); - - final int listId = Integer.parseInt(st.nextToken()); - L2TradeList buy1 = new L2TradeList(listId); - while (st.hasMoreTokens()) - { - final int itemId = Integer.parseInt(st.nextToken()); - int price = Integer.parseInt(st.nextToken()); - final L2ItemInstance item = ItemTable.getInstance().createDummyItem(itemId); - - if (price < (item.getReferencePrice() / 2)) - { - LOGGER.warning("L2TradeList " + listId + " itemId " + itemId + " has an ADENA sell price lower then reference price.. Automatically Updating it.."); - price = item.getReferencePrice(); - } - - item.setPriceToSell(price); - buy1.addItem(item); - itemCreated++; - } - - _lists.put(new Integer(buy1.getListId()), buy1); - return itemCreated; - } - public L2TradeList getBuyList(int listId) { if (_lists.get(new Integer(listId)) != null) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java index b1e54773f1..ae4db5db50 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.concurrent.Future; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; @@ -209,11 +208,6 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable @Override public synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1) { - if (Config.DEBUG) - { - _log1.info("L2SiegeAI.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 @@ -388,11 +382,6 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable */ private void thinkAttack() { - if (Config.DEBUG) - { - _log1.info("L2FortSiegeGuardAI.thinkAttack(); timeout=" + (_attackTimeout - GameTimeController.getGameTicks())); - } - if (_attackTimeout < GameTimeController.getGameTicks()) { // Check if the actor is running diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2NpcWalkerAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2NpcWalkerAI.java index d981ed90e7..b61a8c2e1c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2NpcWalkerAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2NpcWalkerAI.java @@ -38,12 +38,12 @@ public class L2NpcWalkerAI extends L2CharacterAI implements Runnable * home points for xyz */ int _homeX; - + /** * home points for xyz */ int _homeY; - + /** * home points for xyz */ @@ -154,10 +154,6 @@ public class L2NpcWalkerAI extends L2CharacterAI implements Runnable if (delay < 0) { delay = DEFAULT_MOVE_DELAY; - if (Config.DEVELOPER) - { - LOGGER.warning("Wrong Delay Set in Npc Walker Functions = " + delay + " secs, using default delay: " + DEFAULT_MOVE_DELAY + " secs instead."); - } } _nextMoveTime = System.currentTimeMillis() + delay; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java index 70d003d056..d6b86c15af 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java @@ -165,11 +165,6 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable @Override public void changeIntention(CtrlIntention intention, Object arg0, Object arg1) { - if (Config.DEBUG) - { - LOGGER.info("L2SiegeAI.changeIntention(" + intention + ", " + arg0 + ", " + arg1 + ")"); - } - ((L2Attackable) _actor).setisReturningToSpawnPoint(false); if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present @@ -567,11 +562,6 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable */ private void thinkAttack() { - if (Config.DEBUG) - { - LOGGER.info("L2SiegeGuardAI.thinkAttack(); timeout=" + (_attackTimeout - GameTimeController.getGameTicks())); - } - if (_attackTimeout < GameTimeController.getGameTicks()) { // Check if the actor is running diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/GmListTable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/GmListTable.java index da48f43a4e..7da7a1acd3 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/GmListTable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/GmListTable.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; @@ -102,21 +101,11 @@ public class GmListTable */ public void addGm(L2PcInstance player, boolean hidden) { - if (Config.DEBUG) - { - LOGGER.info("added gm: " + player.getName()); - } - _gmList.put(player, hidden); } public void deleteGm(L2PcInstance player) { - if (Config.DEBUG) - { - LOGGER.info("deleted gm: " + player.getName()); - } - _gmList.remove(player); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/csv/DoorTable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/csv/DoorTable.java index e888795a40..51d66adaa3 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/csv/DoorTable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/csv/DoorTable.java @@ -104,10 +104,6 @@ public class DoorTable { clanhall.getDoors().add(door); door.setClanHall(clanhall); - if (Config.DEBUG) - { - LOGGER.warning("door " + door.getDoorName() + " attached to ch " + clanhall.getName()); - } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/AccessLevels.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/AccessLevels.java index 22d920898e..5b287157bb 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/AccessLevels.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/AccessLevels.java @@ -148,14 +148,6 @@ public class AccessLevels } LOGGER.info("AccessLevels: Master Access Level is " + Config.MASTERACCESS_LEVEL); LOGGER.info("AccessLevels: User Access Level is " + Config.USERACCESS_LEVEL); - if (Config.DEBUG) - { - for (int actual : _accessLevels.keySet()) - { - final AccessLevel actual_access = _accessLevels.get(actual); - LOGGER.info("AccessLevels: " + actual_access.getName() + " Access Level is " + actual_access.getLevel()); - } - } } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/HennaTreeTable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/HennaTreeTable.java index 575ac564c8..d54369ea9a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/HennaTreeTable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/HennaTreeTable.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.datatables.csv.HennaTable; import com.l2jmobius.gameserver.model.actor.instance.L2HennaInstance; @@ -99,10 +98,6 @@ public class HennaTreeTable statement2.close(); count += list.size(); - if (Config.DEBUG) - { - LOGGER.info("Henna Tree for Class: " + classId + " has " + list.size() + " Henna Templates."); - } } classlist.close(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/AugmentationData.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/AugmentationData.java index c6d6cd2541..ce4fbb4190 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/AugmentationData.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/AugmentationData.java @@ -104,15 +104,6 @@ public class AugmentationData // Use size*4: since theres 4 blocks of stat-data with equivalent size LOGGER.info("AugmentationData: Loaded: " + (_augmentationStats[0].size() * 4) + " augmentation stats."); - - if (Config.DEBUG) - { - for (int i = 1; i <= 10; i++) - { - LOGGER.info("AugmentationData: Loaded: " + _blueSkills.get(i).size() + " blue, " + _purpleSkills.get(i).size() + " purple and " + _redSkills.get(i).size() + " red skills for lifeStoneLevel " + i); - } - } - } public static void reload() @@ -218,10 +209,6 @@ public class AugmentationData File file = new File(Config.DATAPACK_ROOT + "/data/stats/augmentation/augmentation_skillmap.xml"); if (!file.exists()) { - if (Config.DEBUG) - { - LOGGER.info("The augmentation skillmap file is missing."); - } return; } @@ -262,19 +249,11 @@ public class AugmentationData if (skillId == 0) { - if (Config.DEBUG) - { - LOGGER.warning("Bad skillId in augmentation_skillmap.xml in the augmentationId:" + augmentationId); - } badAugmantData++; continue; } - else if (skillLvL == 0) + if (skillLvL == 0) { - if (Config.DEBUG) - { - LOGGER.warning("Bad skillLevel in augmentation_skillmap.xml in the augmentationId:" + augmentationId); - } badAugmantData++; continue; } @@ -326,11 +305,6 @@ public class AugmentationData if (!file.exists()) { - if (Config.DEBUG) - { - LOGGER.info("The augmentation stat data file " + i + " is missing."); - } - return; } @@ -572,10 +546,6 @@ public class AugmentationData } } } - if (Config.DEBUG) - { - LOGGER.info("Augmentation success: stat12=" + stat12 + "; stat34=" + stat34 + "; resultColor=" + resultColor + "; level=" + lifeStoneLevel + "; grade=" + lifeStoneGrade); - } return new L2Augmentation(item, ((stat34 << 16) + stat12), skill, true); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/ItemTable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/ItemTable.java index b42be24b34..006d7d4d15 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/ItemTable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/ItemTable.java @@ -220,11 +220,6 @@ public class ItemTable item.setItemLootShedule(itemLootShedule); } - if (Config.DEBUG) - { - LOGGER.info("ItemTable: Item created oid: " + item.getObjectId() + " itemid: " + itemId); - } - // Add the L2ItemInstance object to _allObjects of L2world L2World.getInstance().storeObject(item); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/ZoneData.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/ZoneData.java index b690ed9a44..e7b559a27d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/ZoneData.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/ZoneData.java @@ -120,15 +120,7 @@ public class ZoneData factory.setIgnoringComments(true); File file = new File(Config.DATAPACK_ROOT + "/data/zones/zone.xml"); - if (!file.exists()) - { - if (Config.DEBUG) - { - LOGGER.info("The zone.xml file is missing."); - } - - } - else + if (file.exists()) { Document doc = factory.newDocumentBuilder().parse(file); @@ -522,10 +514,6 @@ public class ZoneData if (temp.getZone().intersectsRectangle(ax, bx, ay, by)) { - if (Config.DEBUG) - { - LOGGER.info("Zone (" + zoneId + ") added to: " + x + " " + y); - } worldRegions[x][y].addZone(temp); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java index d2d976fee2..7b54473f14 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -16,13 +16,10 @@ */ package com.l2jmobius.gameserver.handler; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; -import com.l2jmobius.gameserver.datatables.sql.AdminCommandAccessRights; import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminAdmin; import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminAio; import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminAnnouncements; @@ -188,23 +185,6 @@ public class AdminCommandHandler registerAdminCommandHandler(new AdminWho()); LOGGER.info("AdminCommandHandler: Loaded " + _datatable.size() + " handlers."); - - if (Config.DEBUG) - { - String[] commands = new String[_datatable.keySet().size()]; - - commands = _datatable.keySet().toArray(commands); - - Arrays.sort(commands); - - for (String command : commands) - { - if (AdminCommandAccessRights.getInstance().accessRightForCommand(command) < 0) - { - LOGGER.info("ATTENTION: admin command " + command + " has not an access right"); - } - } - } } public void registerAdminCommandHandler(IAdminCommandHandler handler) @@ -212,11 +192,6 @@ public class AdminCommandHandler String[] ids = handler.getAdminCommandList(); for (String element : ids) { - if (Config.DEBUG) - { - LOGGER.info("Adding handler for command " + element); - } - if (_datatable.keySet().contains(new String(element))) { LOGGER.warning("Duplicated command \"" + element + "\" definition in " + handler.getClass().getName() + "."); @@ -237,11 +212,6 @@ public class AdminCommandHandler command = adminCommand.substring(0, adminCommand.indexOf(" ")); } - if (Config.DEBUG) - { - LOGGER.info("getting handler for command: " + command + " -> " + (_datatable.get(command) != null)); - } - return _datatable.get(command); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoChatHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoChatHandler.java index c12c7cb893..54ebf62eaf 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoChatHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoChatHandler.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.Rnd; @@ -62,8 +61,6 @@ public class AutoChatHandler implements SpawnListener private void restoreChatData() { - int numLoaded = 0; - try (Connection con = DatabaseFactory.getConnection()) { PreparedStatement statement = con.prepareStatement("SELECT * FROM auto_chat ORDER BY groupId ASC"); @@ -71,8 +68,6 @@ public class AutoChatHandler implements SpawnListener while (rs.next()) { - numLoaded++; - PreparedStatement statement2 = con.prepareStatement("SELECT * FROM auto_chat_text WHERE groupId=?"); statement2.setInt(1, rs.getInt("groupId")); ResultSet rs2 = statement2.executeQuery(); @@ -98,11 +93,6 @@ public class AutoChatHandler implements SpawnListener rs.close(); statement.close(); - - if (Config.DEBUG) - { - LOGGER.info("AutoChatHandler: Loaded " + numLoaded + " chat group(s) from the database."); - } } catch (Exception e) { @@ -205,12 +195,6 @@ public class AutoChatHandler implements SpawnListener _registeredChats.remove(chatInst.getNPCId()); chatInst.setActive(false); - - if (Config.DEBUG) - { - LOGGER.info("AutoChatHandler: Removed auto chat for NPC ID " + chatInst.getNPCId()); - } - return true; } @@ -304,12 +288,6 @@ public class AutoChatHandler implements SpawnListener _npcId = npcId; _defaultDelay = chatDelay; _globalChat = isGlobal; - - if (Config.DEBUG) - { - LOGGER.info("AutoChatHandler: Registered auto chat for NPC ID " + _npcId + " (Global Chat = " + _globalChat + ")."); - } - setActive(true); } @@ -594,11 +572,6 @@ public class AutoChatHandler implements SpawnListener _chatDelay = chatDelay; _chatTexts = chatTexts; - if (Config.DEBUG) - { - LOGGER.info("AutoChatHandler: Chat definition added for NPC ID " + _npcInstance.getNpcId() + " (Object ID = " + _npcInstance.getObjectId() + ")."); - } - // If global chat isn't enabled for the parent instance, then handle the chat task locally. if (!chatInst.isGlobal()) { @@ -722,11 +695,6 @@ public class AutoChatHandler implements SpawnListener }; } - if (Config.DEBUG) - { - LOGGER.info("AutoChatHandler: Running auto chat for " + chatDefinitions.length + " instances of NPC ID " + _npcId + ". (Global Chat = " + chatInst.isGlobal() + ")"); - } - for (AutoChatDefinition chatDef : chatDefinitions) { try @@ -847,11 +815,6 @@ public class AutoChatHandler implements SpawnListener { nearbyGM.sendPacket(cs); } - - if (Config.DEBUG) - { - LOGGER.info("AutoChatHandler: Chat propogation for object ID " + chatNpc.getObjectId() + " (" + creatureName + ") with text '" + text + "' sent to " + nearbyPlayers.size() + " nearby players."); - } } catch (Exception e) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/UserCommandHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/UserCommandHandler.java index b24555b2fc..1d2e88112b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/UserCommandHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/UserCommandHandler.java @@ -84,21 +84,12 @@ public class UserCommandHandler for (int id : ids) { - if (Config.DEBUG) - { - LOGGER.info("Adding handler for user command " + id); - } _datatable.put(new Integer(id), handler); } } public IUserCommandHandler getUserCommandHandler(int userCommand) { - if (Config.DEBUG) - { - LOGGER.info("getting handler for user command: " + userCommand); - } - return _datatable.get(new Integer(userCommand)); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/VoicedCommandHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/VoicedCommandHandler.java index c3aac66fb0..ce87b714f3 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/VoicedCommandHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/VoicedCommandHandler.java @@ -111,14 +111,8 @@ public class VoicedCommandHandler public void registerVoicedCommandHandler(IVoicedCommandHandler handler) { String[] ids = handler.getVoicedCommandList(); - for (String id : ids) { - if (Config.DEBUG) - { - LOGGER.info("Adding handler for command " + id); - } - _datatable.put(id, handler); } } @@ -126,17 +120,10 @@ public class VoicedCommandHandler public IVoicedCommandHandler getVoicedCommandHandler(String voicedCommand) { String command = voicedCommand; - if (voicedCommand.indexOf(" ") != -1) { command = voicedCommand.substring(0, voicedCommand.indexOf(" ")); } - - if (Config.DEBUG) - { - LOGGER.info("getting handler for command: " + command + " -> " + (_datatable.get(command) != null)); - } - return _datatable.get(command); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminAdmin.java index 4aaac6d25e..94e882c9ff 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminAdmin.java @@ -276,10 +276,7 @@ public class AdminAdmin implements IAdminCommandHandler } catch (NumberFormatException e) { - if (Config.DEBUG) - { - LOGGER.warning("Impossible to parse to integer the string " + mode_s + ", exception " + e.getMessage()); - } + LOGGER.warning(e.getMessage()); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminAio.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminAio.java index a22330428a..ae85dc0e46 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminAio.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminAio.java @@ -199,12 +199,7 @@ public class AdminAio implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } - - LOGGER.warning("could not set Aio stats to char: " + e); + LOGGER.warning("Could not set Aio stats to char: " + e); } } else @@ -237,12 +232,7 @@ public class AdminAio implements IAdminCommandHandler } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } - - LOGGER.warning("could not remove Aio stats of char: " + e); + LOGGER.warning("Could not remove Aio stats of char: " + e); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java index 094613077a..b5a06d14ca 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java @@ -330,10 +330,6 @@ public class AdminBan implements IAdminCommandHandler catch (SQLException se) { BuilderUtil.sendSysMessage(activeChar, "SQLException while chat-banning player"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } @@ -365,10 +361,6 @@ public class AdminBan implements IAdminCommandHandler catch (SQLException se) { BuilderUtil.sendSysMessage(activeChar, "SQLException while jailing player"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } @@ -398,10 +390,6 @@ public class AdminBan implements IAdminCommandHandler catch (SQLException se) { BuilderUtil.sendSysMessage(activeChar, "SQLException while jailing player"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } @@ -460,10 +448,6 @@ public class AdminBan implements IAdminCommandHandler catch (SQLException se) { BuilderUtil.sendSysMessage(activeChar, "SQLException while changing character's access level"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } return output; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java index 5761d5d861..ff9633d153 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java @@ -946,14 +946,6 @@ public class AdminEditChar implements IAdminCommandHandler { LOGGER.warning("listCharacters: found player null into L2World Instance.."); } - else if ((actual_player.isOnline() == 0) && Config.DEBUG) - { - LOGGER.warning("listCharacters: player " + actual_player.getName() + " not online into L2World Instance.."); - } - else if (actual_player.isInOfflineMode() && Config.DEBUG) - { - LOGGER.warning("listCharacters: player " + actual_player.getName() + " offline into L2World Instance.."); - } } L2PcInstance[] players = online_players_list.toArray(new L2PcInstance[online_players_list.size()]); @@ -1177,11 +1169,6 @@ public class AdminEditChar implements IAdminCommandHandler // Admin information player.sendMessage("Changed stats of " + player.getName() + ". HP: " + hpval + " MP: " + mpval + " CP: " + cpval + " PvP: " + pvpflagval + " / " + pvpkillsval); - if (Config.DEBUG) - { - LOGGER.warning("[GM]" + activeChar.getName() + " changed stats of " + player.getName() + ". HP: " + hpval + " MP: " + mpval + " CP: " + cpval + " PvP: " + pvpflagval + " / " + pvpkillsval); - } - showCharacterInfo(activeChar, null); // Back to start player.broadcastUserInfo(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminExpSp.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminExpSp.java index 89fea6d6fa..02c9ae4819 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminExpSp.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminExpSp.java @@ -17,9 +17,7 @@ package com.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.StringTokenizer; -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; @@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil; */ public class AdminExpSp implements IAdminCommandHandler { - private static Logger LOGGER = Logger.getLogger(AdminExpSp.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_add_exp_sp_to_character", @@ -164,11 +160,6 @@ public class AdminExpSp implements IAdminCommandHandler player.addExpAndSp(expval, spval); // Admin information BuilderUtil.sendSysMessage(activeChar, "Added " + expval + " xp and " + spval + " sp to " + player.getName() + "."); - - if (Config.DEBUG) - { - LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + "."); - } } return true; @@ -219,11 +210,6 @@ public class AdminExpSp implements IAdminCommandHandler player.removeExpAndSp(expval, spval); // Admin information BuilderUtil.sendSysMessage(activeChar, "Removed " + expval + " xp and " + spval + " sp from " + player.getName() + "."); - - if (Config.DEBUG) - { - LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + "."); - } } return true; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminGm.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminGm.java index 8844023d4d..ac440ee8ed 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminGm.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminGm.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.handler.admincommandhandlers; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.GmListTable; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil; */ public class AdminGm implements IAdminCommandHandler { - private static Logger LOGGER = Logger.getLogger(AdminGm.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_gm" @@ -59,21 +55,11 @@ public class AdminGm implements IAdminCommandHandler { GmListTable.getInstance().deleteGm(activeChar); BuilderUtil.sendSysMessage(activeChar, "You no longer have GM status."); - - if (Config.DEBUG) - { - LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") turned his GM status off"); - } } else { GmListTable.getInstance().addGm(activeChar, false); BuilderUtil.sendSysMessage(activeChar, "You now have GM status."); - - if (Config.DEBUG) - { - LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") turned his GM status on"); - } } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java index 42cc744cb6..787f14d68b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.handler.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,8 +31,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil; */ public class AdminHeal implements IAdminCommandHandler { - private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_heal" @@ -129,11 +124,6 @@ public class AdminHeal implements IAdminCommandHandler { target.setCurrentCp(target.getMaxCp()); } - - if (Config.DEBUG) - { - LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") healed character " + target.getName()); - } } else { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminKill.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminKill.java index 8b94549c57..9e0059f3db 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminKill.java @@ -17,7 +17,6 @@ package com.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -36,8 +35,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil; */ public class AdminKill implements IAdminCommandHandler { - private static Logger LOGGER = Logger.getLogger(AdminKill.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_kill", @@ -152,11 +149,6 @@ public class AdminKill implements IAdminCommandHandler { target.reduceCurrentHp(target.getMaxHp() + 1, activeChar); } - - if (Config.DEBUG) - { - LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") killed character " + target.getObjectId()); - } } @Override diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java index 6ef5d84afe..e7f7afd2d9 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminPledge.java @@ -17,9 +17,7 @@ package com.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.sql.ClanTable; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Clan; @@ -42,8 +40,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil; */ public class AdminPledge implements IAdminCommandHandler { - private final Logger LOGGER = Logger.getLogger(AdminPledge.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_pledge" @@ -227,10 +223,6 @@ public class AdminPledge implements IAdminCommandHandler } } } - if (Config.DEBUG) - { - LOGGER.info("fixme:action is null"); - } } default: { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminRes.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminRes.java index 2a46da67cb..733163941f 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminRes.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminRes.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.handler.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; @@ -35,7 +32,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil; */ public class AdminRes implements IAdminCommandHandler { - private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName()); private static final String[] ADMIN_COMMANDS = { "admin_res", @@ -124,11 +120,6 @@ public class AdminRes implements IAdminCommandHandler } doResurrect((L2Character) obj); - - if (Config.DEBUG) - { - LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") resurrected character " + obj.getObjectId()); - } } private void handleNonPlayerRes(L2PcInstance activeChar) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java index f519922987..1ab55ca059 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminShop.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.TradeController; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2TradeList; @@ -87,15 +86,10 @@ public class AdminShop implements IAdminCommandHandler if (list != null) { activeChar.sendPacket(new BuyList(list, activeChar.getAdena())); - - if (Config.DEBUG) - { - LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") opened GM shop id " + val); - } } else { - LOGGER.warning("no buylist with id:" + val); + LOGGER.warning("No buylist with id:" + val); } activeChar.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java index eafc2912af..a8d65cf2eb 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java @@ -17,9 +17,7 @@ package com.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.StringTokenizer; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.SkillTable; import com.l2jmobius.gameserver.datatables.sql.SkillTreeTable; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -39,8 +37,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil; */ public class AdminSkill implements IAdminCommandHandler { - private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName()); - private static final String[] ADMIN_COMMANDS = { "admin_show_skills", @@ -499,12 +495,6 @@ public class AdminSkill implements IAdminCommandHandler player.addSkill(skill, true); // Admin information BuilderUtil.sendSysMessage(activeChar, "You gave the skill " + name + " to " + player.getName() + "."); - - if (Config.DEBUG) - { - LOGGER.info("[GM]" + activeChar.getName() + " gave skill " + name + " to " + player.getName() + "."); - } - activeChar.sendSkillList(); } else @@ -540,12 +530,6 @@ public class AdminSkill implements IAdminCommandHandler player.removeSkill(skill); // Admin information BuilderUtil.sendSysMessage(activeChar, "You removed the skill " + skillname + " from " + player.getName() + "."); - - if (Config.DEBUG) - { - LOGGER.info("[GM]" + activeChar.getName() + " removed skill " + skillname + " from " + player.getName() + "."); - } - activeChar.sendSkillList(); } else diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java index 88c3b15ed5..bbe5d3f8e4 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.StringTokenizer; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.datatables.csv.MapRegionTable; import com.l2jmobius.gameserver.datatables.sql.NpcTable; @@ -636,12 +635,6 @@ public class AdminTeleport implements IAdminCommandHandler SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); sm.addString("Created " + template1.name + " on " + target.getObjectId() + "."); activeChar.sendPacket(sm); - - if (Config.DEBUG) - { - LOGGER.info("Spawn at X=" + spawn.getX() + " Y=" + spawn.getY() + " Z=" + spawn.getZ()); - LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") moved NPC " + target.getObjectId()); - } } catch (Exception e) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/itemhandlers/Potions.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/itemhandlers/Potions.java index 249ac7c73d..8577d81fba 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/itemhandlers/Potions.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/itemhandlers/Potions.java @@ -904,10 +904,6 @@ public class Potions implements IItemHandler final L2ItemInstance item = activeChar.getInventory().getItemByItemId(potion); activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false); } - else if (Config.DEBUG) - { - LOGGER.warning("Attention: playable " + playable.getName() + " has not potions " + potion + "!"); - } } else if (playable instanceof L2Summon) { @@ -918,10 +914,6 @@ public class Potions implements IItemHandler final L2ItemInstance item = activeChar.getInventory().getItemByItemId(potion); activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false); } - else if (Config.DEBUG) - { - LOGGER.warning("Attention: playable " + playable.getName() + " has not potions " + potion + "!"); - } } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Harvest.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Harvest.java index 50d843a834..df1017ee08 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Harvest.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Harvest.java @@ -67,11 +67,6 @@ public class Harvest implements ISkillHandler return; } - if (Config.DEBUG) - { - LOGGER.info("Casting harvest"); - } - for (L2Object aTargetList : targetList) { if (!(aTargetList instanceof L2MonsterInstance)) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Pdam.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Pdam.java index 06003df75e..85980a2e79 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Pdam.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Pdam.java @@ -18,9 +18,7 @@ package com.l2jmobius.gameserver.handler.skillhandlers; import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.SkillTable; import com.l2jmobius.gameserver.handler.ISkillHandler; @@ -45,8 +43,6 @@ import com.l2jmobius.gameserver.templates.item.L2WeaponType; public class Pdam implements ISkillHandler { - private static Logger LOGGER = Logger.getLogger(Pdam.class.getName()); - private static final SkillType[] SKILL_IDS = { SkillType.PDAM, @@ -64,11 +60,6 @@ public class Pdam implements ISkillHandler int damage = 0; - if (Config.DEBUG) - { - LOGGER.info("Begin Skill processing in Pdam.java " + skill.getSkillType()); - } - // Calculate targets based on vegeance final List target_s = new ArrayList<>(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Sow.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Sow.java index 3b05ea120b..a40d7b8879 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Sow.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Sow.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.handler.skillhandlers; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.handler.ISkillHandler; @@ -66,11 +65,6 @@ public class Sow implements ISkillHandler return; } - if (Config.DEBUG) - { - LOGGER.info("Casting sow"); - } - for (int index = 0; index < targetList.length; index++) { if (!(targetList[0] instanceof L2MonsterInstance)) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index 9703407cfe..3ceacbe51c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -20,7 +20,6 @@ import java.util.BitSet; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.util.PrimeFinder; @@ -70,10 +69,6 @@ public class BitSetIDFactory extends IdFactory final int objectID = usedObjectId - FIRST_OID; if (objectID < 0) { - if (Config.DEBUG) - { - LOGGER.warning("Object ID " + usedObjectId + " in DB is less than minimum ID of " + FIRST_OID); - } continue; } _freeIds.set(usedObjectId - FIRST_OID); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/BoatManager.java index 5a05c3493f..07bcfb64af 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -79,11 +79,6 @@ public class BoatManager L2BoatInstance boat = parseLine(line); boat.spawn(); _staticItems.put(boat.getObjectId(), boat); - - if (Config.DEBUG) - { - LOGGER.info("Boat ID : " + boat.getObjectId()); - } } } catch (FileNotFoundException e) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index e13d8f52a5..d8f184251a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -96,11 +96,7 @@ public class CursedWeaponsManager private final void load() { - LOGGER.info("Initializing CursedWeaponsManager"); - if (Config.DEBUG) - { - LOGGER.info("Loading data: "); - } + LOGGER.info("Initializing CursedWeaponsManager."); try { final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); @@ -110,10 +106,6 @@ public class CursedWeaponsManager final File file = new File(Config.DATAPACK_ROOT + "/data/cursedWeapons.xml"); if (!file.exists()) { - if (Config.DEBUG) - { - LOGGER.info("NO FILE"); - } return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 5c0944af61..ed3f6c7f54 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -447,10 +447,6 @@ public class FourSepulchersManager extends GrandBossManager SpawnTable.getInstance().addNewSpawn(spawnDat, false); spawnDat.doSpawn(); spawnDat.startRespawn(); - if (Config.DEBUG) - { - LOGGER.info("FourSepulchersManager: spawned " + spawnDat.getTemplate().getName()); - } } catch (SecurityException e) { @@ -587,10 +583,6 @@ public class FourSepulchersManager extends GrandBossManager rset.close(); statement.close(); - if (Config.DEBUG) - { - LOGGER.info("FourSepulchersManager: loaded " + _mysteriousBoxSpawns.size() + " Mysterious-Box spawns."); - } } catch (Exception e) { @@ -637,7 +629,6 @@ public class FourSepulchersManager extends GrandBossManager { _physicalMonsters.clear(); - int loaded = 0; try (Connection con = DatabaseFactory.getConnection()) { PreparedStatement statement1 = con.prepareStatement("SELECT Distinct key_npc_id FROM four_sepulchers_spawnlist Where spawntype = ? ORDER BY key_npc_id"); @@ -671,7 +662,6 @@ public class FourSepulchersManager extends GrandBossManager spawnDat.setRespawnDelay(rset2.getInt("respawn_delay")); SpawnTable.getInstance().addNewSpawn(spawnDat, false); _physicalSpawns.add(spawnDat); - loaded++; } else { @@ -686,10 +676,6 @@ public class FourSepulchersManager extends GrandBossManager rset1.close(); statement1.close(); - if (Config.DEBUG) - { - LOGGER.info("FourSepulchersManager: loaded " + loaded + " Physical type monsters spawns."); - } } catch (Exception e) { @@ -702,7 +688,6 @@ public class FourSepulchersManager extends GrandBossManager { _magicalMonsters.clear(); - int loaded = 0; try (Connection con = DatabaseFactory.getConnection()) { PreparedStatement statement1 = con.prepareStatement("SELECT Distinct key_npc_id FROM four_sepulchers_spawnlist Where spawntype = ? ORDER BY key_npc_id"); @@ -736,7 +721,6 @@ public class FourSepulchersManager extends GrandBossManager spawnDat.setRespawnDelay(rset2.getInt("respawn_delay")); SpawnTable.getInstance().addNewSpawn(spawnDat, false); _magicalSpawns.add(spawnDat); - loaded++; } else { @@ -751,10 +735,6 @@ public class FourSepulchersManager extends GrandBossManager rset1.close(); statement1.close(); - if (Config.DEBUG) - { - LOGGER.info("FourSepulchersManager: loaded " + loaded + " Magical type monsters spawns."); - } } catch (Exception e) { @@ -768,7 +748,6 @@ public class FourSepulchersManager extends GrandBossManager _dukeFinalMobs.clear(); _archonSpawned.clear(); - int loaded = 0; try (Connection con = DatabaseFactory.getConnection()) { PreparedStatement statement1 = con.prepareStatement("SELECT Distinct key_npc_id FROM four_sepulchers_spawnlist Where spawntype = ? ORDER BY key_npc_id"); @@ -802,7 +781,6 @@ public class FourSepulchersManager extends GrandBossManager spawnDat.setRespawnDelay(rset2.getInt("respawn_delay")); SpawnTable.getInstance().addNewSpawn(spawnDat, false); _dukeFinalSpawns.add(spawnDat); - loaded++; } else { @@ -818,10 +796,6 @@ public class FourSepulchersManager extends GrandBossManager rset1.close(); statement1.close(); - if (Config.DEBUG) - { - LOGGER.info("FourSepulchersManager: loaded " + loaded + " Church of duke monsters spawns."); - } } catch (Exception e) { @@ -834,7 +808,6 @@ public class FourSepulchersManager extends GrandBossManager { _emperorsGraveNpcs.clear(); - int loaded = 0; try (Connection con = DatabaseFactory.getConnection()) { PreparedStatement statement1 = con.prepareStatement("SELECT Distinct key_npc_id FROM four_sepulchers_spawnlist Where spawntype = ? ORDER BY key_npc_id"); @@ -868,7 +841,6 @@ public class FourSepulchersManager extends GrandBossManager spawnDat.setRespawnDelay(rset2.getInt("respawn_delay")); SpawnTable.getInstance().addNewSpawn(spawnDat, false); _emperorsGraveSpawns.add(spawnDat); - loaded++; } else { @@ -883,10 +855,6 @@ public class FourSepulchersManager extends GrandBossManager rset1.close(); statement1.close(); - if (Config.DEBUG) - { - LOGGER.info("FourSepulchersManager: loaded " + loaded + " Emperor's grave NPC spawns."); - } } catch (Exception e) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index eee8f1fb4a..846a507ca8 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -240,10 +240,6 @@ public class ItemsOnGroundManager if (_items.isEmpty()) { - if (Config.DEBUG) - { - LOGGER.warning("ItemsOnGroundManager: nothing to save..."); - } return; } @@ -291,10 +287,6 @@ public class ItemsOnGroundManager e.printStackTrace(); } } - if (Config.DEBUG) - { - LOGGER.warning("ItemsOnGroundManager: " + _items.size() + " items on ground saved"); - } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 563766c65c..0923bd1a82 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -300,12 +300,6 @@ public class CursedWeapon _player.addSkill(skill, false); skill = SkillTable.getInstance().getInfo(3631, 1); _player.addSkill(skill, false); - - if (Config.DEBUG) - { - LOGGER.info("Player " + _player.getName() + " has been awarded with skill " + skill); - } - _player.sendSkillList(); } @@ -450,11 +444,6 @@ public class CursedWeapon public void saveData() { - if (Config.DEBUG) - { - LOGGER.info("CursedWeapon: Saving data to disk."); - } - try (Connection con = DatabaseFactory.getConnection()) { // Delete previous datas diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/ForceBuff.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/ForceBuff.java index e4d848a40f..43f0d82ca9 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/ForceBuff.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/ForceBuff.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.SkillTable; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.skills.effects.EffectForce; @@ -77,11 +76,6 @@ public final class ForceBuff L2Effect effect = _target.getFirstEffect(_forceId); if (effect != null) { - if (Config.DEVELOPER) - { - LOGGER.info(" -- Removing ForceBuff " + effect.getSkill().getId()); - } - if (effect instanceof EffectForce) { ((EffectForce) effect).decreaseForce(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/Inventory.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/Inventory.java index 02062beb05..00ee40f171 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/Inventory.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/Inventory.java @@ -1163,13 +1163,7 @@ public abstract class Inventory extends ItemContainer */ private void unEquipItemInBodySlot(int slot) { - if (Config.DEBUG) - { - LOGGER.info("--- unequip body slot:" + slot); - } - int pdollSlot = -1; - switch (slot) { case L2Item.SLOT_L_EAR: diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java index 081e6167be..9c83857165 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -708,11 +708,6 @@ public class L2Clan statement.setInt(9, _clanId); statement.execute(); statement.close(); - - if (Config.DEBUG) - { - LOGGER.info("New clan leader saved in db: " + _clanId); - } } catch (Exception e) { @@ -737,11 +732,6 @@ public class L2Clan statement.setInt(10, _allyCrestId); statement.execute(); statement.close(); - - if (Config.DEBUG) - { - LOGGER.info("New clan saved in db: " + _clanId); - } } catch (Exception e) { @@ -761,11 +751,6 @@ public class L2Clan statement.execute(); statement.close(); - if (Config.DEBUG) - { - LOGGER.info("clan member removed in db: " + _clanId); - } - statement = con.prepareStatement("UPDATE characters SET apprentice=0 WHERE apprentice=?"); statement.setInt(1, member.getObjectId()); statement.execute(); @@ -860,11 +845,6 @@ public class L2Clan clanData.close(); statement.close(); - if (Config.DEBUG && (_name != null)) - { - LOGGER.info("Restored clan data for \"" + _name + "\" from database."); - } - restoreSubPledges(); restoreRankPrivs(); restoreSkills(); @@ -1562,11 +1542,6 @@ public class L2Clan { setReputationScore(_reputationScore - 2500, true); } - - if (Config.DEBUG) - { - LOGGER.info("New sub_clan saved in db: " + _clanId + "; " + pledgeType); - } } catch (Exception e) { @@ -1634,11 +1609,6 @@ public class L2Clan statement.execute(); statement.close(); - - if (Config.DEBUG) - { - LOGGER.info("New subpledge leader saved in db: " + _clanId); - } } catch (Exception e) { @@ -2119,11 +2089,6 @@ public class L2Clan return; } - if (Config.DEBUG) - { - LOGGER.info(player.getObjectId() + "(" + player.getName() + ") requested ally creation from "); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.ONLY_CLAN_LEADER_CREATE_ALLIANCE); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Potion.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Potion.java index ddd4feb800..032a871bbc 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Potion.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Potion.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model; import java.util.concurrent.Future; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -87,11 +86,6 @@ public class L2Potion extends L2Object } _potionhpRegTask = null; - - if (Config.DEBUG) - { - LOGGER.info("Potion HP regen stop"); - } } public void setCurrentHpPotion2() @@ -183,11 +177,6 @@ public class L2Potion extends L2Object private void startPotionMpRegeneration(L2Character activeChar) { _potionmpRegTask = ThreadPool.scheduleAtFixedRate(new PotionMpHealing(activeChar), 1000, _milliseconds); - - if (Config.DEBUG) - { - LOGGER.info("Potion MP regen Started"); - } } public void stopPotionMpRegeneration() @@ -198,11 +187,6 @@ public class L2Potion extends L2Object } _potionmpRegTask = null; - - if (Config.DEBUG) - { - LOGGER.info("Potion MP regen stop"); - } } public void setCurrentMpPotion2() diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2World.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2World.java index fbf6ba5675..55299e5585 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2World.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2World.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Point3D; import com.l2jmobius.commons.util.object.L2ObjectMap; import com.l2jmobius.commons.util.object.L2ObjectSet; @@ -119,14 +118,8 @@ public final class L2World { if (_allObjects.get(object.getObjectId()) != null) { - if (Config.DEBUG) - { - LOGGER.warning("[L2World] objectId " + object.getObjectId() + " already exist in OID map!"); - } - return; } - _allObjects.put(object); } @@ -414,10 +407,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) - { - LOGGER.info("objects in range:" + visibles.size()); - } // tell the player about the surroundings // Go through the visible objects contained in the circular area @@ -460,10 +449,6 @@ public final class L2World // Get all visible objects contained in the _visibleObjects of L2WorldRegions in a circular area of 2000 units List visibles = getVisibleObjects(object, 2000); - if (Config.DEBUG) - { - LOGGER.info("objects in range:" + visibles.size()); - } // tell the player about the surroundings // Go through the visible objects contained in the circular area @@ -503,10 +488,6 @@ public final class L2World { if ((cha != null) && !cha.isTeleporting()) { - if (Config.DEBUG) - { - LOGGER.info("Removed player: " + cha.getName().toLowerCase()); - } _allPlayers.remove(cha.getName().toLowerCase()); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index eaebf5ed05..16dd3db450 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -184,15 +184,12 @@ public final class L2WorldRegion private void switchAI(Boolean isOn) { - int c = 0; - if (!isOn) { for (L2Object o : _visibleObjects) { if (o instanceof L2Attackable) { - c++; final L2Attackable mob = (L2Attackable) o; // Set target to null and cancel Attack or Cast @@ -227,10 +224,6 @@ public final class L2WorldRegion } } } - if (Config.DEBUG) - { - LOGGER.info(c + " mobs were turned off"); - } } else { @@ -238,7 +231,6 @@ public final class L2WorldRegion { if (o instanceof L2Attackable) { - c++; // Start HP/MP/CP Regeneration task ((L2Attackable) o).getStatus().startHpMpRegeneration(); } @@ -249,10 +241,6 @@ public final class L2WorldRegion ((L2NpcInstance) o).startRandomAnimationTask(); } } - if (Config.DEBUG) - { - LOGGER.info(c + " mobs were turned on"); - } } } @@ -299,19 +287,6 @@ public final class L2WorldRegion // turn the AI on or off to match the region's activation. switchAI(value); - - // TODO: turn the geodata on or off to match the region's activation. - if (Config.DEBUG) - { - if (value) - { - LOGGER.info("Starting Grid " + _tileX + "," + _tileY); - } - else - { - LOGGER.info("Stoping Grid " + _tileX + "," + _tileY); - } - } } /** @@ -465,10 +440,6 @@ public final class L2WorldRegion LOGGER.info("Removed NPC " + target.getObjectId()); } } - if (Config.DEBUG) - { - LOGGER.info("All visible NPCs deleted in Region: " + getName()); - } } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/TradeList.java index cb53779325..05b8b1576d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/TradeList.java @@ -1095,19 +1095,11 @@ public class TradeList { if (_locked) { - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] Locked, return false"); - } return false; } if ((items == null) || (items.length == 0)) { - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] items==null || items.length == 0, return false"); - } return false; } @@ -1126,10 +1118,6 @@ public class TradeList L2ItemInstance oldItem = player.checkItemManipulation(item.getObjectId(), item.getCount(), "sell"); if (oldItem == null) { - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] player.checkItemManipulation(item.getObjectId(), item.getCount(), 'sell') null, return false"); - } return false; } @@ -1140,10 +1128,6 @@ public class TradeList { if (ti.getPrice() != item.getPrice()) { - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] ti.getPrice() != item.getPrice(), return false"); - } return false; } @@ -1206,10 +1190,6 @@ public class TradeList L2ItemInstance oldItem = player.checkItemManipulation(item.getObjectId(), item.getCount(), "sell"); if (oldItem == null) { - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] oldItem == null, return false"); - } return false; } @@ -1224,11 +1204,6 @@ public class TradeList L2ItemInstance newItem = playerInventory.transferItem("PrivateStore", item.getObjectId(), item.getCount(), ownerInventory, player, _owner); if (newItem == null) { - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] newItem == null, return false"); - } - return false; } @@ -1288,11 +1263,6 @@ public class TradeList if (price > ownerInventory.getInventoryItemCount(Config.SELL_ITEM, -1)) { lock(); - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] price > ownerInventory.getInventoryItemCount(Config.SELL_ITEM, -1), return false"); - } - return false; } @@ -1300,11 +1270,6 @@ public class TradeList if (item == null) { - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] item==null, return false"); - } - lock(); return false; } @@ -1314,11 +1279,6 @@ public class TradeList if (oldItem == null) { lock(); - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] _owner.checkItemManipulation(item.getObjectId(), price, 'sell')==null, return false"); - } - return false; } @@ -1326,11 +1286,6 @@ public class TradeList final L2ItemInstance newItem = ownerInventory.transferItem("PrivateStore", item.getObjectId(), price, playerInventory, _owner, player); if (newItem == null) { - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] newItem = ownerInventory.transferItem('PrivateStore', item.getObjectId(), price, playerInventory,_owner, player) == null, return false"); - } - return false; } @@ -1365,11 +1320,6 @@ public class TradeList // Transfer adena if (price > ownerInventory.getAdena()) { - if (Config.DEBUG) - { - LOGGER.info("[PrivateStoreSell] price > ownerInventory.getAdena(), return false"); - } - return false; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index b062ffe0ea..9421377f4e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -1496,10 +1496,6 @@ public class L2Attackable extends L2NpcInstance { return new RewardItem(drop.getItemId(), itemCount); } - else if ((itemCount == 0) && Config.DEBUG) - { - LOGGER.info("Roll produced 0 items to drop..."); - } return null; } @@ -1799,10 +1795,6 @@ public class L2Attackable extends L2NpcInstance { return new RewardItem(drop.getItemId(), itemCount); } - else if ((itemCount == 0) && Config.DEBUG) - { - LOGGER.info("Roll produced 0 items to drop..."); - } } return null; } @@ -1912,11 +1904,6 @@ public class L2Attackable extends L2NpcInstance continue; } - if (Config.DEBUG) - { - LOGGER.info("Item id to spoil: " + item.getItemId() + " amount: " + item.getCount()); - } - sweepList.add(item); } @@ -1947,11 +1934,6 @@ public class L2Attackable extends L2NpcInstance if (item != null) { - if (Config.DEBUG) - { - LOGGER.info("Item id to drop: " + item.getItemId() + " amount: " + item.getCount()); - } - // Check if the autoLoot mode is active if (Config.AUTO_LOOT) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java index ebd5322bab..fda10a93c1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -589,11 +589,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder return; } - if (Config.DEBUG) - { - LOGGER.info("Broadcast Status Update for " + getObjectId() + "(" + getName() + "). HP: " + getStatus().getCurrentHp()); - } - // Create the Server->Client packet StatusUpdate with current HP and MP StatusUpdate su = null; if (Config.FORCE_COMPLETE_STATUS_UPDATE && (this instanceof L2PcInstance)) @@ -718,11 +713,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder z += 5; - if (Config.DEBUG) - { - LOGGER.info("Teleporting to: " + x + ", " + y + ", " + z); - } - // Send a Server->Client packet TeleportToLocationt to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character broadcastPacket(new TeleportToLocation(this, x, y, z)); @@ -843,11 +833,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ protected void doAttack(L2Character target) { - if (Config.DEBUG) - { - LOGGER.info(getName() + " doAttack: target=" + target); - } - if (target == null) { return; @@ -7336,11 +7321,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // if skill came with another one, we should delete the other one too. if (oldSkill.triggerAnotherSkill()) { - if (Config.DEBUG) - { - LOGGER.info("Removing Triggherable Skill: " + oldSkill.getTriggeredId()); - } - _triggeredSkills.remove(oldSkill.getTriggeredId()); removeSkill(oldSkill.getTriggeredId(), true); } @@ -7367,10 +7347,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder if (newSkill.triggerAnotherSkill()) { - if (Config.DEBUG) - { - LOGGER.info("Adding Triggherable Skill: " + newSkill.getTriggeredId()); - } _triggeredSkills.put(newSkill.getTriggeredId(), SkillTable.getInstance().getInfo(newSkill.getTriggeredId(), newSkill.getTriggeredLevel())); } } @@ -7473,10 +7449,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // this is just a fail-safe againts buggers and gm dummies... if (oldSkill.triggerAnotherSkill()) { - if (Config.DEBUG) - { - LOGGER.info("Removing Triggherable Skill: " + oldSkill.getTriggeredId()); - } removeSkill(oldSkill.getTriggeredId(), true); _triggeredSkills.remove(oldSkill.getTriggeredId()); } @@ -8451,11 +8423,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public void disableAllSkills() { - if (Config.DEBUG) - { - LOGGER.info("All skills disabled"); - } - _allSkillsDisabled = true; } @@ -8465,11 +8432,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public void enableAllSkills() { - if (Config.DEBUG) - { - LOGGER.info("All skills enabled"); - } - _allSkillsDisabled = false; } @@ -8933,11 +8895,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder if (Math.abs(angleDiff) <= maxAngleDiff) { - if (Config.DEBUG) - { - LOGGER.info("Char " + getName() + " is behind " + target.getName()); - } - return true; } } @@ -9034,11 +8991,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder return false; } - if (Config.DEBUG) - { - LOGGER.info("Char " + getName() + " is side " + target.getName()); - } - return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 836a8061f0..28d84a6b25 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -199,11 +199,6 @@ public abstract class L2Summon extends L2Playable } else if (player.getTarget() != this) { - if (Config.DEBUG) - { - LOGGER.info("New target selected:" + getObjectId()); - } - player.setTarget(this); MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()); player.sendPacket(my); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java index f75cd9f911..dc85624a9d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.datatables.csv.MapRegionTable; import com.l2jmobius.gameserver.instancemanager.AuctionManager; @@ -184,21 +183,11 @@ public final class L2AuctioneerInstance extends L2FolkInstance { return; } - if (Config.DEBUG) - { - player.sendMessage("bidding show successful"); - } try { SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); final int auctionId = Integer.parseInt(val); - - if (Config.DEBUG) - { - player.sendMessage("auction test started"); - } - String filename = "data/html/auction/AgitAuctionInfo.htm"; Auction a = AuctionManager.getInstance().getAuction(auctionId); @@ -334,11 +323,6 @@ public final class L2AuctioneerInstance extends L2FolkInstance limit *= Integer.parseInt(val); } - if (Config.DEBUG) - { - player.sendMessage("cmd list: auction test started"); - } - String items = ""; items += ""; for (int j = 1; j <= npage; j++) @@ -392,11 +376,6 @@ public final class L2AuctioneerInstance extends L2FolkInstance auctionId = Integer.parseInt(val); } - if (Config.DEBUG) - { - player.sendMessage("cmd bidlist: auction test started"); - } - String biders = ""; Map bidders = AuctionManager.getInstance().getAuction(auctionId).getBidders(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CastleChamberlainInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CastleChamberlainInstance.java index c7a27aeb8a..5e4e36fdec 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CastleChamberlainInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CastleChamberlainInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.NoSuchElementException; import java.util.StringTokenizer; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.TradeController; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.datatables.sql.ClanTable; @@ -276,10 +275,6 @@ public class L2CastleChamberlainInstance extends L2FolkInstance player.tempInvetoryDisable(); - if (Config.DEBUG) - { - LOGGER.info("Showing chamberlain buylist"); - } int buy; { final int castleId = getCastle().getCastleId(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java index b480dc8648..a3fbf5f258 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java @@ -256,10 +256,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - LOGGER.warning("Hp editing invoked"); - } val = st.nextToken(); final int percent = Integer.valueOf(val); switch (percent) @@ -350,10 +346,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - LOGGER.warning("Mp editing invoked"); - } val = st.nextToken(); final int percent = Integer.valueOf(val); switch (percent) @@ -404,10 +396,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - LOGGER.warning("Exp editing invoked"); - } val = st.nextToken(); final int percent = Integer.valueOf(val); switch (percent) @@ -529,10 +517,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance player.sendMessage("This clan Hall have no owner, you cannot change configuration"); return; } - if (Config.DEBUG) - { - LOGGER.warning("Item editing invoked"); - } val = st.nextToken(); int fee; final int lvl = Integer.valueOf(val); @@ -574,10 +558,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - LOGGER.warning("Tele editing invoked"); - } val = st.nextToken(); final int lvl = Integer.valueOf(val); switch (lvl) @@ -613,10 +593,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - LOGGER.warning("Support editing invoked"); - } val = st.nextToken(); final int lvl = Integer.valueOf(val); switch (lvl) @@ -739,10 +715,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - LOGGER.warning("Deco curtains editing invoked"); - } val = st.nextToken(); final int lvl = Integer.valueOf(val); switch (lvl) @@ -778,10 +750,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance if (st.countTokens() >= 1) { int fee; - if (Config.DEBUG) - { - LOGGER.warning("Deco curtains editing invoked"); - } val = st.nextToken(); final int lvl = Integer.valueOf(val); switch (lvl) @@ -1083,10 +1051,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance */ private void doTeleport(L2PcInstance player, int val) { - if (Config.DEBUG) - { - player.sendMessage("doTeleport(L2PcInstance player, int val) is called"); - } L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val); if (list != null) { @@ -1098,10 +1062,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance } else if (player.reduceAdena("Teleport", list.getPrice(), this, true)) { - if (Config.DEBUG) - { - LOGGER.warning("Teleporting player " + player.getName() + " for CH to new location: " + list.getX() + ":" + list.getY() + ":" + list.getZ()); - } player.teleToLocation(list.getX(), list.getY(), list.getZ()); } } @@ -1128,11 +1088,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance player.tempInvetoryDisable(); - if (Config.DEBUG) - { - LOGGER.info("Showing buylist :" + player.getName() + " List ID :" + val); - } - L2TradeList list = TradeController.getInstance().getBuyList(val); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java index 50ffe79acd..80e201815c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java @@ -58,11 +58,6 @@ public final class L2ClassMasterInstance extends L2FolkInstance @Override public void onAction(L2PcInstance player) { - if (Config.DEBUG) - { - LOGGER.info("Class master activated!"); - } - player.setLastFolkNPC(this); // Check if the L2PcInstance already target the L2NpcInstance @@ -685,10 +680,6 @@ public final class L2ClassMasterInstance extends L2FolkInstance */ private void changeClass(L2PcInstance player, int val) { - if (Config.DEBUG) - { - LOGGER.info("Changing class to ClassId:" + val); - } player.setClassId(val); if (player.isSubClassActive()) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CommanderInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CommanderInstance.java index 81c8750514..2e4a51743c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CommanderInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CommanderInstance.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.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -99,11 +98,6 @@ public class L2CommanderInstance extends L2Attackable _homeX = getX(); _homeY = getY(); _homeZ = getZ(); - - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": Home location set to X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ); - } } public int getHomeX() @@ -123,10 +117,6 @@ public class L2CommanderInstance extends L2Attackable { if (!isInsideRadius(_homeX, _homeY, 40, false)) { - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableMobInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableMobInstance.java index 5e4173d43f..1c836f2fbb 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableMobInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableMobInstance.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.L2ControllableMobAI; @@ -115,11 +114,6 @@ public class L2ControllableMobInstance extends L2MonsterInstance if (isDead()) { // first die (and calculate rewards), if currentHp < 0, then overhit may be calculated - if (Config.DEBUG) - { - LOGGER.info("char is dead."); - } - stopMove(null); // Start the doDie process diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java index 2c7271d4d3..1eb139a5b7 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.concurrent.Future; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlEvent; @@ -665,12 +664,6 @@ public class L2CubicInstance if ((target != null) && (!target.isDead())) { - if (Config.DEBUG) - { - LOGGER.info("L2CubicInstance: Action.run();"); - LOGGER.info("Cubic Id: " + _id + " Target: " + target.getName() + " distance: " + Math.sqrt(target.getDistanceSq(owner.getX(), owner.getY(), owner.getZ()))); - } - owner.broadcastPacket(new MagicSkillUse(owner, target, skill.getId(), skill.getLevel(), 0, 0)); final SkillType type = skill.getSkillType(); @@ -682,43 +675,23 @@ public class L2CubicInstance if ((type == SkillType.PARALYZE) || (type == SkillType.STUN) || (type == SkillType.ROOT) || (type == SkillType.AGGDAMAGE)) { - if (Config.DEBUG) - { - LOGGER.info("L2CubicInstance: Action.run() handler " + type); - } useCubicDisabler(type, L2CubicInstance.this, skill, targets); } else if (type == SkillType.MDAM) { - if (Config.DEBUG) - { - LOGGER.info("L2CubicInstance: Action.run() handler " + type); - } useCubicMdam(L2CubicInstance.this, skill, targets); } else if ((type == SkillType.POISON) || (type == SkillType.DEBUFF) || (type == SkillType.DOT)) { - if (Config.DEBUG) - { - LOGGER.info("L2CubicInstance: Action.run() handler " + type); - } useCubicContinuous(L2CubicInstance.this, skill, targets); } else if (type == SkillType.DRAIN) { - if (Config.DEBUG) - { - LOGGER.info("L2CubicInstance: Action.run() skill " + type); - } ((L2SkillDrain) skill).useCubicSkill(L2CubicInstance.this, targets); } else { handler.useSkill(owner, skill, targets); - if (Config.DEBUG) - { - LOGGER.info("L2CubicInstance: Action.run(); other handler"); - } } } } @@ -804,12 +777,6 @@ public class L2CubicInstance final boolean mcrit = Formulas.calcMCrit(activeCubic.getMCriticalHit(target, skill)); final int damage = (int) Formulas.calcMagicDam(activeCubic, target, skill, mcrit); - - if (Config.DEBUG) - { - LOGGER.info("L2SkillMdam: useCubicSkill() -> damage = " + damage); - } - if (damage > 0) { // Manage attack or cast break of the target (calculating rate, sending message...) @@ -849,11 +816,6 @@ public class L2CubicInstance */ public void useCubicDisabler(SkillType type, L2CubicInstance activeCubic, L2Skill skill, L2Object[] targets) { - if (Config.DEBUG) - { - LOGGER.info("Disablers: useCubicSkill()"); - } - for (L2Character target : (L2Character[]) targets) { if ((target == null) || target.isDead()) @@ -883,14 +845,6 @@ public class L2CubicInstance { skill.getEffects(activeCubic.getOwner(), target); } - if (Config.DEBUG) - { - LOGGER.info("Disablers: useCubicSkill() -> success"); - } - } - else if (Config.DEBUG) - { - LOGGER.info("Disablers: useCubicSkill() -> failed"); } break; } @@ -914,14 +868,6 @@ public class L2CubicInstance { skill.getEffects(activeCubic.getOwner(), target); } - if (Config.DEBUG) - { - LOGGER.info("Disablers: useCubicSkill() -> success"); - } - } - else if (Config.DEBUG) - { - LOGGER.info("Disablers: useCubicSkill() -> failed"); } break; } @@ -971,14 +917,6 @@ public class L2CubicInstance { skill.getEffects(activeCubic.getOwner(), target); } - if (Config.DEBUG) - { - LOGGER.info("Disablers: useCubicSkill() -> success"); - } - } - else if (Config.DEBUG) - { - LOGGER.info("Disablers: useCubicSkill() -> failed"); } break; } @@ -991,14 +929,6 @@ public class L2CubicInstance target.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, activeCubic.getOwner(), (int) ((150 * skill.getPower()) / (target.getLevel() + 7))); } skill.getEffects(activeCubic.getOwner(), target); - if (Config.DEBUG) - { - LOGGER.info("Disablers: useCubicSkill() -> success"); - } - } - else if (Config.DEBUG) - { - LOGGER.info("Disablers: useCubicSkill() -> failed"); } break; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 63e158b762..5f133f235c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.L2CharacterAI; @@ -169,23 +168,14 @@ public class L2DoorInstance extends L2Character { try { - String doorAction; - if (!_open) { - doorAction = "opened"; openMe(); } else { - doorAction = "closed"; closeMe(); } - - if (Config.DEBUG) - { - LOGGER.info("Auto " + doorAction + " door ID " + _doorId + " (" + _name + ") for " + (_autoActionDelay / 60000) + " minute(s)."); - } } catch (Exception e) { @@ -539,28 +529,6 @@ public class L2DoorInstance extends L2Character return; } - if (Config.DEBUG) - { - LOGGER.info("player " + player.getObjectId()); - LOGGER.info("Door " + getObjectId()); - LOGGER.info("player clan " + player.getClan()); - if (player.getClan() != null) - { - LOGGER.info("player clanid " + player.getClanId()); - LOGGER.info("player clanleaderid " + player.getClan().getLeaderId()); - } - LOGGER.info("clanhall " + _clanHall); - if (_clanHall != null) - { - LOGGER.info("clanhallID " + _clanHall.getId()); - LOGGER.info("clanhallOwner " + _clanHall.getOwnerId()); - for (L2DoorInstance door : _clanHall.getDoors()) - { - LOGGER.info("clanhallDoor " + door.getObjectId()); - } - } - } - // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { @@ -617,28 +585,6 @@ public class L2DoorInstance extends L2Character return; } - if (Config.DEBUG) - { - LOGGER.info("player " + player.getObjectId()); - LOGGER.info("Door " + getObjectId()); - LOGGER.info("player clan " + player.getClan()); - if (player.getClan() != null) - { - LOGGER.info("player clanid " + player.getClanId()); - LOGGER.info("player clanleaderid " + player.getClan().getLeaderId()); - } - LOGGER.info("clanhall " + _clanHall); - if (_clanHall != null) - { - LOGGER.info("clanhallID " + _clanHall.getId()); - LOGGER.info("clanhallOwner " + _clanHall.getOwnerId()); - for (L2DoorInstance door : _clanHall.getDoors()) - { - LOGGER.info("clanhallDoor " + door.getObjectId()); - } - } - } - if (player.getAccessLevel().isGm()) { player.setTarget(this); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java index 4737046cdd..45b45e6e1e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java @@ -67,10 +67,6 @@ public class L2FishermanInstance extends L2FolkInstance taxRate = getCastle().getTaxRate(); } player.tempInvetoryDisable(); - if (Config.DEBUG) - { - LOGGER.info("Showing buylist"); - } L2TradeList list = TradeController.getInstance().getBuyList(val); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) @@ -89,18 +85,7 @@ public class L2FishermanInstance extends L2FolkInstance private void showSellWindow(L2PcInstance player) { - if (Config.DEBUG) - { - LOGGER.info("Showing selllist"); - } - player.sendPacket(new SellList(player)); - - if (Config.DEBUG) - { - LOGGER.info("Showing sell window"); - } - player.sendPacket(ActionFailed.STATIC_PACKET); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FolkInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FolkInstance.java index a6498f03b6..1083ce3302 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FolkInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FolkInstance.java @@ -63,11 +63,6 @@ public class L2FolkInstance extends L2NpcInstance */ public void showSkillList(L2PcInstance player, ClassId classId) { - if (Config.DEBUG) - { - LOGGER.info("SkillList activated on: " + getObjectId()); - } - final int npcId = getTemplate().npcId; if (_classesToTeach == null) @@ -150,11 +145,6 @@ public class L2FolkInstance extends L2NpcInstance */ public void showEnchantSkillList(L2PcInstance player, ClassId classId) { - if (Config.DEBUG) - { - LOGGER.info("EnchantSkillList activated on: " + getObjectId()); - } - final int npcId = getTemplate().npcId; if (_classesToTeach == null) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FortSiegeGuardInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FortSiegeGuardInstance.java index 650d58d463..210af29cd7 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FortSiegeGuardInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2FortSiegeGuardInstance.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; @@ -112,10 +111,6 @@ public class L2FortSiegeGuardInstance extends L2Attackable } if (!isInsideRadius(getSpawn().getX(), getSpawn().getY(), 40, false)) { - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); @@ -141,11 +136,6 @@ public class L2FortSiegeGuardInstance extends L2Attackable // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - LOGGER.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 140fa651e8..998504f9e7 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_C6_Interlude/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.commons.concurrent.ThreadPool; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -42,8 +39,6 @@ import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate; */ public final class L2GuardInstance extends L2Attackable { - private static Logger LOGGER = Logger.getLogger(L2GuardInstance.class.getName()); - private static final int RETURN_INTERVAL = 60000; private int _homeX; private int _homeY; @@ -115,11 +110,6 @@ public final class L2GuardInstance extends L2Attackable _homeX = getX(); _homeY = getY(); _homeZ = getZ(); - - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": Home location set to X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ); - } } /** @@ -139,13 +129,7 @@ public final class L2GuardInstance extends L2Attackable { if (!isInsideRadius(_homeX, _homeY, 150, false)) { - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": moving hometo X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ); - } - clearAggroList(); - getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_homeX, _homeY, _homeZ, 0)); } } @@ -162,11 +146,6 @@ public final class L2GuardInstance extends L2Attackable _homeY = getY(); _homeZ = getZ(); - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": Home location set to X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ); - } - // check the region where this mob is, do not activate the AI if region is inactive. L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY()); if ((region != null) && !region.isActive()) @@ -234,11 +213,6 @@ public final class L2GuardInstance extends L2Attackable // Check if the L2PcInstance already target the L2GuardInstance if (getObjectId() != player.getTargetId()) { - if (Config.DEBUG) - { - LOGGER.info(player.getObjectId() + ": Targetted guard " + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); @@ -252,11 +226,6 @@ public final class L2GuardInstance extends L2Attackable } else if (containsTarget(player)) // Check if the L2PcInstance is in the _aggroList of the L2GuardInstance { - if (Config.DEBUG) - { - LOGGER.info(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_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardNoHTMLInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardNoHTMLInstance.java index 0bdfd19f66..91772ac77c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardNoHTMLInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardNoHTMLInstance.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -41,8 +38,6 @@ import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate; */ public final class L2GuardNoHTMLInstance extends L2Attackable { - private static Logger LOGGER = Logger.getLogger(L2GuardNoHTMLInstance.class.getName()); - private static final int RETURN_INTERVAL = 60000; private int _homeX; private int _homeY; @@ -113,10 +108,6 @@ public final class L2GuardNoHTMLInstance extends L2Attackable _homeX = getX(); _homeY = getY(); _homeZ = getZ(); - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": Home location set to X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ); - } } /** @@ -136,10 +127,6 @@ public final class L2GuardNoHTMLInstance extends L2Attackable { if (!isInsideRadius(_homeX, _homeY, 150, false)) { - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": moving hometo X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ); - } clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_homeX, _homeY, _homeZ, 0)); } @@ -155,10 +142,7 @@ public final class L2GuardNoHTMLInstance extends L2Attackable _homeX = getX(); _homeY = getY(); _homeZ = getZ(); - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": Home location set to X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ); - } + // check the region where this mob is, do not activate the AI if region is inactive. final L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY()); if ((region != null) && !region.isActive()) @@ -196,26 +180,16 @@ public final class L2GuardNoHTMLInstance extends L2Attackable { // Set the L2PcInstance Intention to AI_INTENTION_IDLE player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null); - if (Config.DEBUG) - { - LOGGER.info(player.getObjectId() + ": Targetted guard " + getObjectId()); - } // Set the target of the L2PcInstance player player.setTarget(this); - // Send a Server->Client packet MyTargetSelected to the L2PcInstance - // player The color to display in the select window is White + // Send a Server->Client packet MyTargetSelected to the L2PcInstance player The color to display in the select window is White final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0); player.sendPacket(my); - // Send a Server->Client packet ValidateLocation to correct the - // L2NpcInstance position and heading on the client + // Send a Server->Client packet ValidateLocation to correct the L2NpcInstance position and heading on the client player.sendPacket(new ValidateLocation(this)); } else if (containsTarget(player)) // Check if the L2PcInstance is in the _aggroList of the L2GuardInstance { - if (Config.DEBUG) - { - LOGGER.info(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_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java index e711dbc6cd..4911b78037 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java @@ -1306,10 +1306,6 @@ public final class L2ItemInstance extends L2Object } catch (Exception e) { - if (Config.DEBUG) - { - LOGGER.warning("ATTENTION: Update Item instead of Insert one, check player with id " + _ownerId + " actions on item " + getObjectId()); - } updateInDb(); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MercManagerInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MercManagerInstance.java index 30df27a9d4..b282792c7e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MercManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MercManagerInstance.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.StringTokenizer; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.TradeController; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.model.L2Clan; @@ -118,10 +117,6 @@ public final class L2MercManagerInstance extends L2FolkInstance private void showBuyWindow(L2PcInstance player, int val) { player.tempInvetoryDisable(); - if (Config.DEBUG) - { - LOGGER.info("Showing buylist"); - } L2TradeList list = TradeController.getInstance().getBuyList(val); if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 4f970d738b..1e3f5e3eb1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -70,12 +70,6 @@ public class L2MerchantInstance extends L2FolkInstance private void showWearWindow(L2PcInstance player, int val) { player.tempInvetoryDisable(); - - if (Config.DEBUG) - { - LOGGER.info("Showing wearlist"); - } - L2TradeList list = TradeController.getInstance().getBuyList(val); if (list != null) @@ -106,13 +100,7 @@ public class L2MerchantInstance extends L2FolkInstance player.tempInvetoryDisable(); - if (Config.DEBUG) - { - LOGGER.info("Showing buylist"); - } - L2TradeList list = TradeController.getInstance().getBuyList(val); - if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) { BuyList bl = new BuyList(list, player.getAdena(), taxRate); @@ -133,18 +121,7 @@ public class L2MerchantInstance extends L2FolkInstance */ private void showSellWindow(L2PcInstance player) { - if (Config.DEBUG) - { - LOGGER.info("Showing selllist"); - } - player.sendPacket(new SellList(player)); - - if (Config.DEBUG) - { - LOGGER.info("Showing sell window"); - } - player.sendPacket(ActionFailed.STATIC_PACKET); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index 6b0553f495..61ee386769 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -769,11 +769,6 @@ public class L2NpcInstance extends L2Character // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - LOGGER.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); @@ -2016,18 +2011,6 @@ public class L2NpcInstance extends L2Character final String stateId = State.getStateName(qs.getState()); final String path = Config.DATAPACK_ROOT + "/data/scripts/quests/" + questId + "/" + stateId + ".htm"; content = HtmCache.getInstance().getHtm(path); - - if (Config.DEBUG) - { - if (content != null) - { - LOGGER.info("Showing quest window for quest " + questId + " html path: " + path); - } - else - { - LOGGER.info("File not exists for quest " + questId + " html path: " + path); - } - } } // Send a Server->Client packet NpcHtmlMessage to the L2PcInstance in order to display the message of the L2Npc diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcWalkerInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcWalkerInstance.java index 61cbee566d..ed5244fad8 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcWalkerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcWalkerInstance.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.Map; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2NpcWalkerAI; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -77,10 +76,6 @@ public class L2NpcWalkerInstance extends L2NpcInstance if (_knownPlayers == null) { - if (Config.DEVELOPER) - { - LOGGER.info("broadcastChat _players == null"); - } return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 30714a5fac..d5a236ecf4 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -1654,12 +1654,12 @@ public final class L2PcInstance extends L2Playable continue; } - if (qs.isCompleted() && !Config.DEVELOPER) + if (qs.isCompleted()) { continue; } - if (!qs.isStarted() && !Config.DEVELOPER) + if (!qs.isStarted()) { continue; } @@ -1864,11 +1864,6 @@ public final class L2PcInstance extends L2Playable if (content != null) { - if (Config.DEBUG) - { - LOGGER.info("Showing quest window for quest " + questId + " state " + stateId + " html path: " + path); - } - NpcHtmlMessage npcReply = new NpcHtmlMessage(5); npcReply.setHtml(content); sendPacket(npcReply); @@ -2922,10 +2917,6 @@ public final class L2PcInstance extends L2Playable if (!effectSkill.getWeaponDependancy(this)) { sendMessage(effectSkill.getName() + " cannot be used with this weapon."); - if (Config.DEBUG) - { - LOGGER.info(" | Skill " + effectSkill.getName() + " has been disabled for (" + getName() + "); Reason: Incompatible Weapon Type."); - } currenteffect.exit(); } } @@ -2981,10 +2972,6 @@ public final class L2PcInstance extends L2Playable public void setPvpKills(int pvpKills) { _pvpKills = pvpKills; - - /* - * // Set hero aura if pvp kills > 100 if (pvpKills > 100) { isPermaHero = true; setHeroAura(true); } - */ } /** @@ -3183,11 +3170,6 @@ public final class L2PcInstance extends L2Playable { L2Skill skill = SkillTable.getInstance().getInfo(194, 1); skill = removeSkill(skill); - - if (Config.DEBUG && (skill != null)) - { - LOGGER.info("Removed skill 'Lucky' from " + getName()); - } } // Calculate the current higher Expertise of the L2PcInstance @@ -3204,15 +3186,6 @@ public final class L2PcInstance extends L2Playable { L2Skill skill = SkillTable.getInstance().getInfo(239, getExpertiseIndex()); addSkill(skill, !restore); - - if (Config.DEBUG) - { - LOGGER.info("Awarded " + getName() + " with new expertise."); - } - } - else if (Config.DEBUG) - { - LOGGER.info("No skills awarded at lvl: " + lvl); } // Active skill dwarven craft @@ -4927,21 +4900,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 (((getPet() != null) && (getPet().getControlItemId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return null; } if ((getActiveEnchantItem() != null) && (getActiveEnchantItem().getObjectId() == objectId)) { - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } - return null; } @@ -4960,11 +4923,6 @@ public final class L2PcInstance extends L2Playable */ public void setProtection(boolean protect) { - if (Config.DEVELOPER && (protect || (_protectEndTime > 0))) - { - LOGGER.info(getName() + ": Protection " + (protect ? "ON " + (GameTimeController.getGameTicks() + (Config.PLAYER_SPAWN_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getGameTicks() + ")"); - } - if (isInOlympiadMode()) { return; @@ -4984,11 +4942,6 @@ public final class L2PcInstance extends L2Playable */ public void setTeleportProtection(boolean protect) { - if (Config.DEVELOPER && (protect || (_teleportProtectEndTime > 0))) - { - LOGGER.warning(getName() + ": Tele Protection " + (protect ? "ON " + (GameTimeController.getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND)) : "OFF") + " (currently " + GameTimeController.getGameTicks() + ")"); - } - _teleportProtectEndTime = protect ? GameTimeController.getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0; if (protect) @@ -5689,10 +5642,6 @@ public final class L2PcInstance extends L2Playable // Check if a party is in progress and party window update is usefull if (isInParty() && (needCpUpdate(352) || super.needHpUpdate(352) || needMpUpdate(352))) { - if (Config.DEBUG) - { - LOGGER.info("Send status for party window of " + getObjectId() + "(" + getName() + ") to his party. CP: " + getCurrentCp() + " HP: " + getCurrentHp() + " MP: " + getCurrentMp()); - } // Send the Server->Client packet PartySmallWindowUpdate with current HP, MP and Level to all other L2PcInstance of the Party PartySmallWindowUpdate update = new PartySmallWindowUpdate(this); getParty().broadcastToPartyMembers(this, update); @@ -5705,10 +5654,6 @@ public final class L2PcInstance extends L2Playable { if ((player.getOlympiadGameId() == getOlympiadGameId()) && player.isOlympiadStart()) { - if (Config.DEBUG) - { - LOGGER.info("Send status for Olympia window of " + getObjectId() + "(" + getName() + ") to " + player.getObjectId() + "(" + player.getName() + "). CP: " + getCurrentCp() + " HP: " + getCurrentHp() + " MP: " + getCurrentMp()); - } player.sendPacket(new ExOlympiadUserInfo(this, 1)); } } @@ -5830,13 +5775,6 @@ public final class L2PcInstance extends L2Playable { // Send a Server->Client packet UserInfo to this L2PcInstance sendPacket(new UserInfo(this)); - - // Send a Server->Client packet CharInfo to all L2PcInstance in _KnownPlayers of the L2PcInstance - if (Config.DEBUG) - { - LOGGER.info("players to notify:" + getKnownList().getKnownPlayers().size() + " packet: [S] 03 CharInfo"); - } - Broadcast.toKnownPlayers(this, new CharInfo(this)); } @@ -5847,13 +5785,6 @@ public final class L2PcInstance extends L2Playable { // Send a Server->Client packet UserInfo to this L2PcInstance sendPacket(new UserInfo(this)); - - // Send a Server->Client packet TitleUpdate to all L2PcInstance in _KnownPlayers of the L2PcInstance - if (Config.DEBUG) - { - LOGGER.info("players to notify:" + getKnownList().getKnownPlayers().size() + " packet: [S] cc TitleUpdate"); - } - Broadcast.toKnownPlayers(this, new TitleUpdate(this)); } @@ -5996,12 +5927,7 @@ public final class L2PcInstance extends L2Playable sendPacket(ActionFailed.STATIC_PACKET); // Send a Server->Client packet StopMove to this L2PcInstance - StopMove sm = new StopMove(this); - if (Config.DEBUG) - { - LOGGER.info("pickup pos: " + target.getX() + " " + target.getY() + " " + target.getZ()); - } - sendPacket(sm); + sendPacket(new StopMove(this)); synchronized (target) { @@ -8005,11 +7931,6 @@ public final class L2PcInstance extends L2Playable setCharmOfCourage(false); } - if (Config.DEBUG) - { - LOGGER.info(getName() + " died and lost " + lostExp + " experience."); - } - // Set the new Experience value of the L2PcInstance getStat().addExp(-lostExp); } @@ -8500,22 +8421,10 @@ public final class L2PcInstance extends L2Playable protected void reduceArrowCount() { L2ItemInstance arrows = getInventory().destroyItem("Consume", getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LHAND), 1, this, null); - - if (Config.DEBUG) - { - LOGGER.info("arrow count:" + (arrows == null ? 0 : arrows.getCount())); - } - if ((arrows == null) || (arrows.getCount() == 0)) { getInventory().unEquipItemInSlot(Inventory.PAPERDOLL_LHAND); _arrowItem = null; - - if (Config.DEBUG) - { - LOGGER.info("removed arrows count"); - } - sendPacket(new ItemList(this, false)); } else if (!Config.FORCE_INVENTORY_UPDATE) @@ -10368,12 +10277,6 @@ public final class L2PcInstance extends L2Playable if (!foundskill) { removeSkill(skill); - - if (Config.DEBUG) - { - LOGGER.warning("Character " + getName() + " of Account " + getAccountName() + " got skill " + skill.getName() + ".. Removed!"/* + IllegalPlayerAction.PUNISH_KICK */); - - } } } @@ -11271,11 +11174,6 @@ public final class L2PcInstance extends L2Playable return; } - if (Config.DEBUG && (getQueuedSkill() != null)) - { - LOGGER.info(getQueuedSkill().getSkill().getName() + " is already queued for " + getName() + "."); - } - // Create a new SkillDat object and queue it in the player _queuedSkill setQueuedSkill(skill, forceUse, dontMove); sendPacket(ActionFailed.STATIC_PACKET); @@ -11295,19 +11193,6 @@ public final class L2PcInstance extends L2Playable // triggered skills cannot be used directly if (_triggeredSkills.size() > 0) { - - if (Config.DEBUG) - { - LOGGER.info("Checking if Triggherable Skill: " + skill.getId()); - LOGGER.info("Saved Triggherable Skills"); - - for (Integer skillId : _triggeredSkills.keySet()) - { - LOGGER.info("" + skillId); - } - - } - if (_triggeredSkills.get(skill.getId()) != null) { sendPacket(ActionFailed.STATIC_PACKET); @@ -12087,17 +11972,12 @@ public final class L2PcInstance extends L2Playable */ public void addCubic(int id, int level, double matk, int activationtime, int activationchance, int totalLifetime, boolean givenByOther) { - if (Config.DEBUG) - { - LOGGER.info("L2PcInstance(" + getName() + "): addCubic(" + id + "|" + level + "|" + matk + ")"); - } final L2CubicInstance cubic = new L2CubicInstance(this, id, level, (int) matk, activationtime, activationchance, totalLifetime, givenByOther); synchronized (_cubics) { _cubics.put(id, cubic); } - } /** @@ -13617,15 +13497,9 @@ public final class L2PcInstance extends L2Playable if (output) { - // Commit after database INSERT incase exception is thrown. getSubClasses().put(newClass.getClassIndex(), newClass); - if (Config.DEBUG) - { - LOGGER.info(getName() + " added class ID " + classId + " as a sub class at index " + classIndex + "."); - } - ClassId subTemplate = ClassId.values()[classId]; Collection skillTree = SkillTreeTable.getInstance().getAllowedSkills(subTemplate); @@ -13652,11 +13526,6 @@ public final class L2PcInstance extends L2Playable storeSkill(newSkill, prevSkill, classIndex); } } - - if (Config.DEBUG) - { - LOGGER.info(getName() + " was given " + getAllSkills().length + " skills for their new sub class."); - } } return output; @@ -13672,13 +13541,6 @@ public final class L2PcInstance extends L2Playable */ public boolean modifySubClass(int classIndex, int newClassId) { - final int oldClassId = getSubClasses().get(classIndex).getClassId(); - - if (Config.DEBUG) - { - LOGGER.info(getName() + " has requested to modify sub class index " + classIndex + " from class ID " + oldClassId + " to " + newClassId + "."); - } - boolean output = false; try (Connection con = DatabaseFactory.getConnection()) @@ -15097,21 +14959,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 (((getPet() != null) && (getPet().getControlItemId() == objectId)) || (getMountObjectID() == objectId)) { - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": player tried to " + action + " item controling pet"); - } - return false; } if ((getActiveEnchantItem() != null) && (getActiveEnchantItem().getObjectId() == objectId)) { - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ":player tried to " + action + " an enchant scroll he was using"); - } - return false; } @@ -16366,20 +16218,9 @@ public final class L2PcInstance extends L2Playable { if (currentSkill == null) { - if (Config.DEBUG) - { - LOGGER.info("Setting current skill: NULL for " + getName() + "."); - } - _currentSkill = null; return; } - - if (Config.DEBUG) - { - LOGGER.info("Setting current skill: " + currentSkill.getName() + " (ID: " + currentSkill.getId() + ") for " + getName() + "."); - } - _currentSkill = new SkillDat(currentSkill, ctrlPressed, shiftPressed); } @@ -16403,20 +16244,9 @@ public final class L2PcInstance extends L2Playable { if (queuedSkill == null) { - if (Config.DEBUG) - { - LOGGER.info("Setting queued skill: NULL for " + getName() + "."); - } - _queuedSkill = null; return; } - - if (Config.DEBUG) - { - LOGGER.info("Setting queued skill: " + queuedSkill.getName() + " (ID: " + queuedSkill.getId() + ") for " + getName() + "."); - } - _queuedSkill = new SkillDat(queuedSkill, ctrlPressed, shiftPressed); } @@ -16588,11 +16418,6 @@ public final class L2PcInstance extends L2Playable */ public void restoreCustomStatus() { - if (Config.DEVELOPER) - { - LOGGER.info("Restoring character status " + getName() + " from database..."); - } - int hero = 0; int noble = 0; int donator = 0; @@ -18482,20 +18307,9 @@ public final class L2PcInstance extends L2Playable { if (currentSkill == null) { - if (Config.DEBUG) - { - LOGGER.info("Setting current pet skill: NULL for " + getName() + "."); - } - _currentPetSkill = null; return; } - - if (Config.DEBUG) - { - LOGGER.info("Setting current Pet skill: " + currentSkill.getName() + " (ID: " + currentSkill.getId() + ") for " + getName() + "."); - } - _currentPetSkill = new SkillDat(currentSkill, ctrlPressed, shiftPressed); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 0a076a2ffc..ed3f14e1b1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -170,10 +170,7 @@ public class L2PetInstance extends L2Summon } catch (Throwable e) { - if (Config.DEBUG) - { - LOGGER.info("Pet [#" + getObjectId() + "] a feed task error has occurred: " + e); - } + LOGGER.info("Pet [#" + getObjectId() + "] a feed task error has occurred: " + e); } } } @@ -288,11 +285,6 @@ public class L2PetInstance extends L2Summon } else { - if (Config.DEBUG) - { - LOGGER.info("new target selected:" + getObjectId()); - } - player.setTarget(this); MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()); player.sendPacket(my); @@ -474,14 +466,7 @@ public class L2PetInstance extends L2Summon protected void doPickupItem(L2Object object) { getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - StopMove sm = new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading()); - - if (Config.DEBUG) - { - LOGGER.info("Pet pickup pos: " + object.getX() + " " + object.getY() + " " + object.getZ()); - } - - broadcastPacket(sm); + broadcastPacket(new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading())); if (!(object instanceof L2ItemInstance)) { @@ -964,10 +949,6 @@ public class L2PetInstance extends L2Summon { _feedTask.cancel(false); _feedTask = null; - if (Config.DEBUG) - { - LOGGER.info("Pet [#" + getObjectId() + "] feed task stop"); - } } } @@ -978,7 +959,6 @@ public class L2PetInstance extends L2Summon public synchronized void startFeed(boolean battleFeed) { // stop feeding task if its active - stopFeed(); if (!isDead()) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java index 0ad4efae65..9e2607abc1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.Future; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -106,11 +105,6 @@ public class L2SepulcherNpcInstance extends L2NpcInstance // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - LOGGER.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SiegeGuardInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SiegeGuardInstance.java index 540e6ec177..32b89dd15d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SiegeGuardInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SiegeGuardInstance.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.instance; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.L2CharacterAI; @@ -41,8 +38,6 @@ import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate; */ public class L2SiegeGuardInstance extends L2Attackable { - private static Logger LOGGER = Logger.getLogger(L2GuardInstance.class.getName()); - private int _homeX; private int _homeY; private int _homeZ; @@ -103,11 +98,6 @@ public class L2SiegeGuardInstance extends L2Attackable _homeX = getX(); _homeY = getY(); _homeZ = getZ(); - - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": Home location set to X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ); - } } public int getHomeX() @@ -127,10 +117,6 @@ public class L2SiegeGuardInstance extends L2Attackable { if (!isInsideRadius(_homeX, _homeY, 40, false)) { - if (Config.DEBUG) - { - LOGGER.info(getObjectId() + ": moving home"); - } setisReturningToSpawnPoint(true); clearAggroList(); @@ -155,11 +141,6 @@ public class L2SiegeGuardInstance extends L2Attackable // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) { - if (Config.DEBUG) - { - LOGGER.info("new target selected:" + getObjectId()); - } - // Set the target of the L2PcInstance player player.setTarget(this); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SummonInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SummonInstance.java index 0d04266c69..3760ba0f20 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SummonInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2SummonInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.concurrent.Future; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Skill; @@ -90,19 +89,7 @@ public class L2SummonInstance extends L2Summon // When no item consume is defined task only need to check when summon life time has ended. // Otherwise have to destroy items from owner's inventory in order to let summon live. - final int delay = 1000; - - if (Config.DEBUG && (_itemConsumeCount != 0)) - { - LOGGER.warning("L2SummonInstance: Item Consume ID: " + _itemConsumeId + ", Count: " + _itemConsumeCount + ", Rate: " + _itemConsumeSteps + " times."); - } - - if (Config.DEBUG) - { - LOGGER.warning("L2SummonInstance: Task Delay " + (delay / 1000) + " seconds."); - } - - _summonLifeTask = ThreadPool.scheduleAtFixedRate(new SummonLifetime(getOwner(), this), delay, delay); + _summonLifeTask = ThreadPool.scheduleAtFixedRate(new SummonLifetime(getOwner(), this), 1000, 1000); } @Override @@ -213,11 +200,6 @@ public class L2SummonInstance extends L2Summon return false; } - if (Config.DEBUG) - { - LOGGER.warning("L2SummonInstance: " + getTemplate().name + " (" + getOwner().getName() + ") has been killed."); - } - if (_summonLifeTask != null) { _summonLifeTask.cancel(true); @@ -240,11 +222,6 @@ public class L2SummonInstance extends L2Summon @Override public void run() { - if (Config.DEBUG) - { - LOGGER.warning("L2SummonInstance: " + _summon.getTemplate().name + " (" + _activeChar.getName() + ") run task."); - } - try { final double oldTimeRemaining = _summon.getTimeRemaining(); @@ -287,10 +264,7 @@ public class L2SummonInstance extends L2Summon } catch (Throwable e) { - if (Config.DEBUG) - { - LOGGER.warning("Summon of player [#" + _activeChar.getName() + "] has encountered item consumption errors: " + e); - } + LOGGER.warning("Summon of player [#" + _activeChar.getName() + "] has encountered item consumption errors: " + e); } } } @@ -298,11 +272,6 @@ public class L2SummonInstance extends L2Summon @Override public synchronized void unSummon(L2PcInstance owner) { - if (Config.DEBUG) - { - LOGGER.warning("L2SummonInstance: " + getTemplate().name + " (" + owner.getName() + ") unsummoned."); - } - if (_summonLifeTask != null) { _summonLifeTask.cancel(true); @@ -321,11 +290,6 @@ public class L2SummonInstance extends L2Summon @Override public boolean destroyItemByItemId(String process, int itemId, int count, L2Object reference, boolean sendMessage) { - if (Config.DEBUG) - { - LOGGER.warning("L2SummonInstance: " + getTemplate().name + " (" + getOwner().getName() + ") consume."); - } - return getOwner().destroyItemByItemId(process, itemId, count, reference, sendMessage); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java index 6177a0f3c3..d1d594700c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java @@ -275,28 +275,16 @@ public final class L2TeleporterInstance extends L2FolkInstance // Lilith and Anakim have BossZone, so players must be allowed to enter else if (list.getTeleId() == 450) { - if (Config.DEBUG) - { - LOGGER.info("Teleporting player " + player.getName() + " to new location: " + list.getX() + ":" + list.getY() + ":" + list.getZ()); - } final L2BossZone _zone = GrandBossManager.getInstance().getZone(list.getX(), list.getY(), list.getZ()); _zone.allowPlayerEntry(player, 300); player.teleToLocation(list.getX(), list.getY(), list.getZ(), true); } else if (!list.getIsForNoble() && (Config.ALT_GAME_FREE_TELEPORT || player.reduceAdena("Teleport", list.getPrice(), this, true))) { - if (Config.DEBUG) - { - LOGGER.info("Teleporting player " + player.getName() + " to new location: " + list.getX() + ":" + list.getY() + ":" + list.getZ()); - } player.teleToLocation(list.getX(), list.getY(), list.getZ(), true); } else if (list.getIsForNoble() && (Config.ALT_GAME_FREE_TELEPORT || player.destroyItemByItemId("Noble Teleport", 6651, list.getPrice(), this, true))) { - if (Config.DEBUG) - { - LOGGER.info("Teleporting player " + player.getName() + " to new location: " + list.getX() + ":" + list.getY() + ":" + list.getZ()); - } player.teleToLocation(list.getX(), list.getY(), list.getZ(), true); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index 24feca2f59..3fbcb8cbd2 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -572,11 +572,6 @@ public final class L2VillageMasterInstance extends L2FolkInstance */ public void dissolveClan(L2PcInstance player, int clanId) { - if (Config.DEBUG) - { - LOGGER.info(player.getObjectId() + "(" + player.getName() + ") requested dissolve a clan from " + getObjectId() + "(" + getName() + ")"); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); @@ -648,11 +643,6 @@ public final class L2VillageMasterInstance extends L2FolkInstance */ public void recoverClan(L2PcInstance player, int clanId) { - if (Config.DEBUG) - { - LOGGER.info(player.getObjectId() + "(" + player.getName() + ") requested recover a clan from " + getObjectId() + "(" + getName() + ")"); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); @@ -671,11 +661,6 @@ public final class L2VillageMasterInstance extends L2FolkInstance */ public void changeClanLeader(L2PcInstance player, String target) { - if (Config.DEBUG) - { - LOGGER.info(player.getObjectId() + "(" + player.getName() + ") requested change a clan leader from " + getObjectId() + "(" + getName() + ")"); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); @@ -747,11 +732,6 @@ public final class L2VillageMasterInstance extends L2FolkInstance */ public void createSubPledge(L2PcInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { - if (Config.DEBUG) - { - LOGGER.info(player.getObjectId() + "(" + player.getName() + ") requested sub clan creation from " + getObjectId() + "(" + getName() + ")"); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); @@ -904,11 +884,6 @@ public final class L2VillageMasterInstance extends L2FolkInstance */ public void assignSubPledgeLeader(L2PcInstance player, String clanName, String leaderName) { - if (Config.DEBUG) - { - LOGGER.info(player.getObjectId() + "(" + player.getName() + ") requested to assign sub clan" + clanName + "leader (" + leaderName + ")"); - } - if (!player.isClanLeader()) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); @@ -1050,10 +1025,6 @@ public final class L2VillageMasterInstance extends L2FolkInstance */ public void showPledgeSkillList(L2PcInstance player) { - if (Config.DEBUG) - { - LOGGER.info("PledgeSkillList activated on: " + getObjectId()); - } if (player.getClan() == null) { return; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java index d1fe969687..17542b5d4c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java @@ -71,10 +71,6 @@ public final class L2WarehouseInstance extends L2FolkInstance return; } - if (Config.DEBUG) - { - LOGGER.info("Showing stored items"); - } player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE)); } @@ -87,11 +83,6 @@ public final class L2WarehouseInstance extends L2FolkInstance player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); player.tempInvetoryDisable(); - if (Config.DEBUG) - { - LOGGER.info("Showing items to deposit"); - } - player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.PRIVATE)); } @@ -112,10 +103,6 @@ public final class L2WarehouseInstance extends L2FolkInstance { player.setActiveWarehouse(player.getClan().getWarehouse()); player.tempInvetoryDisable(); - if (Config.DEBUG) - { - LOGGER.info("Showing items to deposit - clan"); - } WareHouseDepositList dl = new WareHouseDepositList(player, WareHouseDepositList.CLAN); player.sendPacket(dl); @@ -143,10 +130,6 @@ public final class L2WarehouseInstance extends L2FolkInstance else { player.setActiveWarehouse(player.getClan().getWarehouse()); - if (Config.DEBUG) - { - LOGGER.info("Showing items to deposit - clan"); - } player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.CLAN)); } } @@ -158,13 +141,8 @@ public final class L2WarehouseInstance extends L2FolkInstance private void showWithdrawWindowFreight(L2PcInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); - if (Config.DEBUG) - { - LOGGER.info("Showing freightened items"); - } PcFreight freight = player.getFreight(); - if (freight != null) { if (freight.getSize() > 0) @@ -185,10 +163,6 @@ public final class L2WarehouseInstance extends L2FolkInstance player.sendPacket(SystemMessageId.NO_ITEM_DEPOSITED_IN_WH); } } - else if (Config.DEBUG) - { - LOGGER.info("no items freightened"); - } } /** @@ -213,11 +187,6 @@ public final class L2WarehouseInstance extends L2FolkInstance } player.sendPacket(new PackageToList(chars)); - - if (Config.DEBUG) - { - LOGGER.info("Showing destination chars to freight - char src: " + player.getName()); - } } } @@ -233,10 +202,6 @@ public final class L2WarehouseInstance extends L2FolkInstance if (destChar == null) { // Something went wrong! - if (Config.DEBUG) - { - LOGGER.warning("Error retrieving a target object for char " + player.getName() + " - using freight."); - } return; } @@ -253,11 +218,6 @@ public final class L2WarehouseInstance extends L2FolkInstance player.tempInvetoryDisable(); destChar.deleteMe(); - if (Config.DEBUG) - { - LOGGER.info("Showing items to freight"); - } - player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.FREIGHT)); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java index a2e2a0851a..1b59a6d8fb 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java +++ b/L2J_Mobius_C6_Interlude/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.ai.L2CharacterAI; @@ -29,8 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class GuardKnownList extends AttackableKnownList { - private static Logger LOGGER = Logger.getLogger(GuardKnownList.class.getName()); - public GuardKnownList(L2GuardInstance activeChar) { super(activeChar); @@ -63,11 +59,6 @@ public class GuardKnownList extends AttackableKnownList if (player.getKarma() > 0) { - if (Config.DEBUG) - { - LOGGER.info(getActiveChar().getObjectId() + ": PK " + player.getObjectId() + " entered scan range"); - } - // Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) { @@ -82,11 +73,6 @@ public class GuardKnownList extends AttackableKnownList if (mob.isAggressive()) { - if (Config.DEBUG) - { - LOGGER.info(getActiveChar().getObjectId() + ": Aggressive mob " + mob.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_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardNoHTMLKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardNoHTMLKnownList.java index e850061247..25d9dfb0b9 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardNoHTMLKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardNoHTMLKnownList.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.ai.L2CharacterAI; @@ -29,8 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public class GuardNoHTMLKnownList extends AttackableKnownList { - private static Logger LOGGER = Logger.getLogger(GuardKnownList.class.getName()); - public GuardNoHTMLKnownList(L2GuardNoHTMLInstance activeChar) { super(activeChar); @@ -63,11 +59,6 @@ public class GuardNoHTMLKnownList extends AttackableKnownList if (player.getKarma() > 0) { - if (Config.DEBUG) - { - LOGGER.info(getActiveChar().getObjectId() + ": PK " + player.getObjectId() + " entered scan range"); - } - // Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) { @@ -82,11 +73,6 @@ public class GuardNoHTMLKnownList extends AttackableKnownList if (mob.isAggressive()) { - if (Config.DEBUG) - { - LOGGER.info(getActiveChar().getObjectId() + ": Aggressive mob " + mob.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_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java index 83676292ad..0ebdd1da33 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.stat; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2Skill; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -29,8 +27,6 @@ import com.l2jmobius.gameserver.skills.Stats; public class CharStat { - private final Logger LOGGER = Logger.getLogger(CharStat.class.getName()); - private final L2Character _activeChar; private long _exp = 0; private int _sp = 0; @@ -861,15 +857,7 @@ public class CharStat { return 1; } - - final int range = (int) calcStat(Stats.POWER_ATTACK_RANGE, _activeChar.getTemplate().baseAtkRange, null, null); - - if (Config.DEBUG && (_activeChar instanceof L2PcInstance)) - { - LOGGER.info(" Player - " + _activeChar.getName() + " - PhysicalAttackRange is - " + range + " -"); - } - - return range; + return (int) calcStat(Stats.POWER_ATTACK_RANGE, _activeChar.getTemplate().baseAtkRange, null, null); } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java index 103e0d5b44..9b08aaacd8 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java @@ -208,11 +208,6 @@ public class PcStat extends PlayableStat if ((getActiveChar().getLevel() >= Config.MAX_LEVEL_NEWBIE_STATUS) && getActiveChar().isNewbie()) { getActiveChar().setNewbie(false); - - if (Config.DEBUG) - { - LOGGER.info("Newbie character ended: " + getActiveChar().getCharId()); - } } QuestState qs = getActiveChar().getQuestState("255_Tutorial"); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index 6925de70e0..a09d6103c7 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -21,7 +21,6 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.Future; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -249,12 +248,6 @@ public class CharStatus } } - // first die (and calculate rewards), if currentHp < 0, then overhit may be calculated - if (Config.DEBUG) - { - LOGGER.info("char is dead."); - } - // Start the doDie process _activeChar.doDie(attacker); @@ -319,11 +312,6 @@ public class CharStatus { if ((_regTask == null) && !_activeChar.isDead()) { - if (Config.DEBUG) - { - LOGGER.info("HP/MP/CP regen started"); - } - // Get the Regeneration periode final int period = Formulas.getRegeneratePeriod(_activeChar); @@ -345,11 +333,6 @@ public class CharStatus { if (_regTask != null) { - if (Config.DEBUG) - { - LOGGER.info("HP/MP/CP regen stop"); - } - // Stop the HP/MP/CP Regeneration task _regTask.cancel(false); _regTask = null; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index c570b855b9..fb88e8e182 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.model.actor.status; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.L2Summon; @@ -154,27 +153,13 @@ public class PcStatus extends PlayableStatus // Send a System Message to the L2PcInstance SystemMessage smsg = new SystemMessage(SystemMessageId.S1_GAVE_YOU_S2_DMG); - if (Config.DEBUG) - { - LOGGER.info("Attacker:" + attacker.getName()); - } - if (attacker instanceof L2NpcInstance) { - final int mobId = ((L2NpcInstance) attacker).getTemplate().idTemplate; - - if (Config.DEBUG) - { - LOGGER.info("mob id:" + mobId); - } - - smsg.addNpcName(mobId); + smsg.addNpcName(((L2NpcInstance) attacker).getTemplate().idTemplate); } else if (attacker instanceof L2Summon) { - final int mobId = ((L2Summon) attacker).getTemplate().idTemplate; - - smsg.addNpcName(mobId); + smsg.addNpcName(((L2Summon) attacker).getTemplate().idTemplate); } else { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index cb97beaa3e..0419034ef9 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.datatables.csv.DoorTable; @@ -230,12 +229,6 @@ public class ClanHall setEndTime(System.currentTimeMillis() + _rate); dbSave(newfc); getOwnerClan().getWarehouse().destroyItemByItemId("CH_function_fee", 57, fee, null, null); - - if (Config.DEBUG) - { - LOGGER.warning("deducted " + fee + " adena from " + _name + " owner's cwh for function id : " + _type); - } - ThreadPool.schedule(new FunctionTask(), _rate); } else @@ -305,12 +298,6 @@ public class ClanHall _clanHallId = clanHallId; _name = name; _ownerId = ownerId; - - if (Config.DEBUG) - { - LOGGER.warning("Init Owner : " + _ownerId); - } - _lease = lease; _desc = desc; _location = location; @@ -704,11 +691,6 @@ public class ClanHall */ public boolean updateFunctions(int type, int lvl, int lease, long rate, boolean addNew) { - if (Config.DEBUG) - { - LOGGER.warning("Called ClanHall.updateFunctions(int type, int lvl, int lease, long rate, boolean addNew) Owner : " + _ownerId); - } - if (addNew) { if (ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() < lease) @@ -724,12 +706,6 @@ public class ClanHall else { final int diffLease = lease - _functions.get(type).getLease(); - - if (Config.DEBUG) - { - LOGGER.warning("Called ClanHall.updateFunctions diffLease : " + diffLease); - } - if (diffLease > 0) { if (ClanTable.getInstance().getClan(_ownerId).getWarehouse().getAdena() < diffLease) @@ -834,12 +810,6 @@ public class ClanHall } ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_rental_fee", 57, getLease(), null, null); - - if (Config.DEBUG) - { - LOGGER.warning("deducted " + getLease() + " adena from " + _name + " owner's cwh for ClanHall _paidUntil" + _paidUntil); - } - ThreadPool.schedule(new FeeTask(), _paidUntil - System.currentTimeMillis()); _paid = true; updateDb(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Hero.java index bee0f2d7c0..37a560d500 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Hero.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.datatables.sql.ClanTable; import com.l2jmobius.gameserver.model.L2Clan; @@ -191,10 +190,6 @@ public class Hero catch (SQLException e) { LOGGER.warning("Hero System: Couldnt load Heroes"); - if (Config.DEBUG) - { - e.printStackTrace(); - } } LOGGER.info("Hero System: Loaded " + _heroes.size() + " Heroes."); LOGGER.info("Hero System: Loaded " + _completeHeroes.size() + " all time Heroes."); @@ -204,12 +199,6 @@ public class Hero { try { - if (Config.DEBUG) - { - LOGGER.info("Adding new hero"); - LOGGER.info("Name:" + player.getName()); - LOGGER.info("ClassId:" + player.getClassId().getId()); - } final StatsSet newHero = new StatsSet(); newHero.set(Olympiad.CHAR_NAME, player.getName()); newHero.set(Olympiad.CLASS_ID, player.getClassId().getId()); @@ -486,10 +475,6 @@ public class Hero catch (SQLException e) { LOGGER.warning("Hero System: Couldnt update Heroes"); - if (Config.DEBUG) - { - e.printStackTrace(); - } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/CTF.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/CTF.java index 47ee6358d1..029456767a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/CTF.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/CTF.java @@ -770,10 +770,6 @@ public class CTF implements EventTask { if (!checkStartJoinOk()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[startJoin]: startJoinOk() = false"); - } return false; } @@ -919,10 +915,6 @@ public class CTF implements EventTask { if (!startEventOk()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[startEvent()]: startEventOk() = false"); - } return false; } @@ -997,10 +989,6 @@ public class CTF implements EventTask { if (!finishEventOk()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[finishEvent]: finishEventOk() = false"); - } return; } @@ -2497,10 +2485,6 @@ public class CTF implements EventTask { if (_inProgress) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[addTeam(" + teamName + ")]: checkTeamOk() = false"); - } return; } @@ -2537,19 +2521,11 @@ public class CTF implements EventTask { if (_inProgress || _teams.isEmpty()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[removeTeam(" + teamName + ")]: checkTeamOk() = false"); - } return; } if (teamPlayersCount(teamName) > 0) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[removeTeam(" + teamName + ")]: teamPlayersCount(teamName) > 0"); - } return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/DM.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/DM.java index ce04dbc689..c93a14a954 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/DM.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/DM.java @@ -731,10 +731,6 @@ public class DM implements EventTask { if (!checkStartJoinOk()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[startJoin]: startJoinOk() = false"); - } return false; } @@ -863,10 +859,6 @@ public class DM implements EventTask { if (!startEventOk()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[startEvent()]: startEventOk() = false"); - } return false; } @@ -949,10 +941,6 @@ public class DM implements EventTask { if (!finishEventOk()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[finishEvent]: finishEventOk() = false"); - } return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/Lottery.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/Lottery.java index c0715a3421..e048e922bc 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/Lottery.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/Lottery.java @@ -185,11 +185,6 @@ public class Lottery LOGGER.warning("Lottery: Could not restore lottery data: " + e); } - if (Config.DEBUG) - { - LOGGER.info("Lottery: Starting ticket sell for lottery #" + _number + "."); - } - _isSellingTickets = true; _isStarted = true; @@ -242,13 +237,7 @@ public class Lottery @Override public void run() { - if (Config.DEBUG) - { - LOGGER.info("Lottery: Stopping ticket sell for lottery #" + _number + "."); - } - _isSellingTickets = false; - Announcements.getInstance().announceToAll(new SystemMessage(SystemMessageId.LOTTERY_TICKET_SALES_TEMP_SUSPENDED)); } } @@ -262,11 +251,6 @@ public class Lottery @Override public void run() { - if (Config.DEBUG) - { - LOGGER.info("Lottery: Ending lottery #" + _number + "."); - } - final int[] luckynums = new int[5]; int luckynum = 0; @@ -291,11 +275,6 @@ public class Lottery luckynums[i] = luckynum; } - if (Config.DEBUG) - { - LOGGER.info("Lottery: The lucky numbers are " + luckynums[0] + ", " + luckynums[1] + ", " + luckynums[2] + ", " + luckynums[3] + ", " + luckynums[4] + "."); - } - int enchant = 0; int type2 = 0; @@ -311,11 +290,6 @@ public class Lottery } } - if (Config.DEBUG) - { - LOGGER.info("Lottery: Encoded lucky numbers are " + enchant + ", " + type2); - } - int count1 = 0; int count2 = 0; int count3 = 0; @@ -405,22 +379,9 @@ public class Lottery prize3 = (int) (((_prize - prize4) * Config.ALT_LOTTERY_3_NUMBER_RATE) / count3); } - if (Config.DEBUG) - { - LOGGER.info("Lottery: " + count1 + " players with all FIVE numbers each win " + prize1 + "."); - LOGGER.info("Lottery: " + count2 + " players with FOUR numbers each win " + prize2 + "."); - LOGGER.info("Lottery: " + count3 + " players with THREE numbers each win " + prize3 + "."); - LOGGER.info("Lottery: " + count4 + " players with ONE or TWO numbers each win " + prize4 + "."); - } - final int newprize = _prize - (prize1 + prize2 + prize3 + prize4); - if (Config.DEBUG) - { - LOGGER.info("Lottery: Jackpot for next lottery is " + newprize + "."); - } SystemMessage sm; - if (count1 > 0) { // There are winners. @@ -581,11 +542,6 @@ public class Lottery res[1] = 200; } } - - if (Config.DEBUG) - { - LOGGER.warning("count: " + count + ", id: " + id + ", enchant: " + enchant + ", type2: " + type2); - } } rset.close(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/TvT.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/TvT.java index 0c50d9f90b..d452a0ce0f 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/TvT.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/TvT.java @@ -735,10 +735,6 @@ public class TvT implements EventTask { if (!checkStartJoinOk()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[startJoin]: startJoinOk() = false"); - } return false; } @@ -848,10 +844,6 @@ public class TvT implements EventTask { if (!startEventOk()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[startEvent()]: startEventOk() = false"); - } return false; } @@ -916,10 +908,6 @@ public class TvT implements EventTask { if (!finishEventOk()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[finishEvent]: finishEventOk() = false"); - } return; } @@ -2386,10 +2374,6 @@ public class TvT implements EventTask { if (_inProgress) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[addTeam(" + teamName + ")]: checkTeamOk() = false"); - } return; } @@ -2426,24 +2410,15 @@ public class TvT implements EventTask { if (_inProgress || _teams.isEmpty()) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[removeTeam(" + teamName + ")]: checkTeamOk() = false"); - } return; } if (teamPlayersCount(teamName) > 0) { - if (Config.DEBUG) - { - LOGGER.warning(_eventName + " Engine[removeTeam(" + teamName + ")]: teamPlayersCount(teamName) > 0"); - } return; } final int index = _teams.indexOf(teamName); - if (index == -1) { return; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/manager/EventsGlobalTask.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/manager/EventsGlobalTask.java index fee56951ed..19144d996c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/manager/EventsGlobalTask.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/manager/EventsGlobalTask.java @@ -19,10 +19,8 @@ package com.l2jmobius.gameserver.model.entity.event.manager; import java.util.ArrayList; import java.util.Calendar; import java.util.Hashtable; -import java.util.Iterator; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; /** @@ -94,35 +92,6 @@ public class EventsGlobalTask implements Runnable } eventid_to_tasks.put(event.getEventIdentifier(), savedTasksForId); - - if (Config.DEBUG) - { - LOGGER.info("Added Event: " + event.getEventIdentifier()); - - // check Info - for (String time : time_to_tasks.keySet()) - { - final ArrayList tasks = time_to_tasks.get(time); - final Iterator taskIt = tasks.iterator(); - while (taskIt.hasNext()) - { - final EventTask actual_event = taskIt.next(); - LOGGER.info(" --Registered Event: " + actual_event.getEventIdentifier()); - } - } - - for (String event_id : eventid_to_tasks.keySet()) - { - LOGGER.info("--Event: " + event_id); - final ArrayList times = eventid_to_tasks.get(event_id); - final Iterator timesIt = times.iterator(); - while (timesIt.hasNext()) - { - final EventTask actual_time = timesIt.next(); - LOGGER.info(" --Registered Time: " + actual_time.getEventStartTime()); - } - } - } } public void clearEventTasksByEventName(String eventId) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/OlympiadManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/OlympiadManager.java index 01a0633c5a..3da380d637 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/OlympiadManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/OlympiadManager.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.olympiad.Olympiad.COMP_TYPE; @@ -121,11 +120,6 @@ class OlympiadManager implements Runnable } catch (Exception ex) { - if (Config.DEBUG) - { - LOGGER.warning("Olympiad Manager: Stadium - " + i + " assignment, an error has been occurred: " + ex); - } - if (_olympiadInstances.get(i) != null) { for (L2PcInstance player : _olympiadInstances.get(i).getPlayers()) @@ -159,11 +153,6 @@ class OlympiadManager implements Runnable } catch (Exception ex) { - if (Config.DEBUG) - { - LOGGER.warning("Olympiad Manager: Stadium - " + i + " assignment, an error has been occurred: " + ex); - } - if (_olympiadInstances.get(i) != null) { for (L2PcInstance player : _olympiadInstances.get(i).getPlayers()) @@ -197,11 +186,6 @@ class OlympiadManager implements Runnable } catch (Exception ex) { - if (Config.DEBUG) - { - LOGGER.warning("Olympiad Manager: Stadium - " + i + " assignment, an error has been occurred: " + ex); - } - if (_olympiadInstances.get(i) != null) { for (L2PcInstance player : _olympiadInstances.get(i).getPlayers()) @@ -234,11 +218,6 @@ class OlympiadManager implements Runnable } catch (Exception ex) { - if (Config.DEBUG) - { - LOGGER.warning("Olympiad Manager: Stadium - " + i + " assignment, an error has been occurred: " + ex); - } - if (_olympiadInstances.get(i) != null) { for (L2PcInstance player : _olympiadInstances.get(i).getPlayers()) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java index fe9f67ac58..e7f2f4a314 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java @@ -902,11 +902,6 @@ public class SevenSigns sevenDat.set("ancient_adena_amount", rset.getDouble("ancient_adena_amount")); sevenDat.set("contribution_score", rset.getDouble("contribution_score")); - if (Config.DEBUG) - { - LOGGER.info("SevenSigns: Loaded data from DB for char ID " + charObjId + " (" + sevenDat.getString("cabal") + ")"); - } - _signsPlayerData.put(charObjId, sevenDat); } @@ -965,11 +960,6 @@ public class SevenSigns */ public void saveSevenSignsData(L2PcInstance player, boolean updateSettings) { - if (Config.DEBUG) - { - LOGGER.info("SevenSigns: Saving data to disk."); - } - try (Connection con = DatabaseFactory.getConnection()) { PreparedStatement statement = null; @@ -996,11 +986,6 @@ public class SevenSigns statement.execute(); statement.close(); - - if (Config.DEBUG) - { - LOGGER.info("SevenSigns: Updated data in database for char ID " + sevenDat.getInteger("char_obj_id") + " (" + sevenDat.getString("cabal") + ")"); - } } if (updateSettings) @@ -1042,11 +1027,6 @@ public class SevenSigns statement.execute(); statement.close(); - - if (Config.DEBUG) - { - LOGGER.info("SevenSigns: Updated data in database."); - } } } catch (SQLException e) @@ -1061,11 +1041,6 @@ public class SevenSigns */ protected void resetPlayerData() { - if (Config.DEBUG) - { - LOGGER.info("SevenSigns: Resetting player data for new event period."); - } - // Reset each player's contribution data as well as seal and cabal. for (StatsSet sevenDat : _signsPlayerData.values()) { @@ -1135,11 +1110,6 @@ public class SevenSigns statement.setInt(3, chosenSeal); statement.execute(); statement.close(); - - if (Config.DEBUG) - { - LOGGER.info("SevenSigns: Inserted data in DB for char ID " + currPlayerData.getInteger("char_obj_id") + " (" + currPlayerData.getString("cabal") + ")"); - } } catch (SQLException e) { @@ -1159,11 +1129,6 @@ public class SevenSigns saveSevenSignsData(player, true); - if (Config.DEBUG) - { - LOGGER.info("SevenSigns: " + player.getName() + " has joined the " + getCabalName(chosenCabal) + " for the " + getSealName(chosenSeal, false) + "!"); - } - return chosenCabal; } @@ -1237,11 +1202,6 @@ public class SevenSigns saveSevenSignsData(player, true); - if (Config.DEBUG) - { - LOGGER.info("SevenSigns: " + player.getName() + " contributed " + contribScore + " seal stone points to their cabal."); - } - return contribScore; } @@ -1369,13 +1329,6 @@ public class SevenSigns */ protected void calcNewSealOwners() { - if (Config.DEBUG) - { - LOGGER.info("SevenSigns: (Avarice) Dawn = " + _signsDawnSealTotals.get(SEAL_AVARICE) + ", Dusk = " + _signsDuskSealTotals.get(SEAL_AVARICE)); - LOGGER.info("SevenSigns: (Gnosis) Dawn = " + _signsDawnSealTotals.get(SEAL_GNOSIS) + ", Dusk = " + _signsDuskSealTotals.get(SEAL_GNOSIS)); - LOGGER.info("SevenSigns: (Strife) Dawn = " + _signsDawnSealTotals.get(SEAL_STRIFE) + ", Dusk = " + _signsDuskSealTotals.get(SEAL_STRIFE)); - } - for (Integer currSeal : _signsDawnSealTotals.keySet()) { final int prevSealOwner = _signsSealOwners.get(currSeal); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java index 0683cdc4ed..1d10b9257c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java @@ -3318,11 +3318,6 @@ public class SevenSignsFestival implements SpawnListener */ protected void restoreFestivalData() { - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Restoring festival data. Current SS Cycle: " + _signsCycle); - } - try (Connection con = DatabaseFactory.getConnection()) { PreparedStatement statement = con.prepareStatement("SELECT festivalId, cabal, cycle, date, score, members FROM seven_signs_festival"); @@ -3342,11 +3337,6 @@ public class SevenSignsFestival implements SpawnListener festivalDat.set("score", rset.getInt("score")); festivalDat.set("members", rset.getString("members")); - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Loaded data from DB for (Cycle = " + festivalCycle + ", Oracle = " + cabal + ", Festival = " + getFestivalName(festivalId)); - } - if (cabal.equals("dawn")) { festivalId += FESTIVAL_COUNT; @@ -3391,11 +3381,6 @@ public class SevenSignsFestival implements SpawnListener } } - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Loaded data from database."); - } - rset.close(); statement.close(); } @@ -3411,11 +3396,6 @@ public class SevenSignsFestival implements SpawnListener */ public void saveFestivalData(boolean updateSettings) { - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Saving festival data to disk."); - } - try (Connection con = DatabaseFactory.getConnection()) { PreparedStatement statement = null; @@ -3440,11 +3420,6 @@ public class SevenSignsFestival implements SpawnListener // If there was no record to update, assume it doesn't exist and add a new one, otherwise continue with the next record to store. if (statement.executeUpdate() > 0) { - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Updated data in DB (Cycle = " + festivalCycle + ", Cabal = " + cabal + ", FestID = " + festivalId + ")"); - } - statement.close(); continue; } @@ -3460,11 +3435,6 @@ public class SevenSignsFestival implements SpawnListener statement.setString(6, festivalDat.getString("members")); statement.execute(); statement.close(); - - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Inserted data in DB (Cycle = " + festivalCycle + ", Cabal = " + cabal + ", FestID = " + festivalId + ")"); - } } } @@ -3884,11 +3854,6 @@ public class SevenSignsFestival implements SpawnListener if (festivalParty != null) { participants = festivalParty.getPartyMembers(); - - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: " + festivalParty.getPartyMembers() + " have signed up to the " + SevenSigns.getCabalShortName(oracle) + " " + getFestivalName(festivalId) + " festival."); - } } if (oracle == SevenSigns.CABAL_DAWN) @@ -3994,11 +3959,6 @@ public class SevenSignsFestival implements SpawnListener currData = new StatsSet(); currData.set("score", 0); currData.set("members", ""); - - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Data missing for " + SevenSigns.getCabalName(oracle) + ", FestivalID = " + festivalId + " (Current Cycle " + _signsCycle + ")"); - } } return currData; @@ -4101,11 +4061,6 @@ public class SevenSignsFestival implements SpawnListener currFestData.set("score", offeringScore); currFestData.set("members", Util.implodeString(partyMembers, ",")); - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: " + player.getName() + "'s party has the highest score (" + offeringScore + ") so far for " + SevenSigns.getCabalName(oracle) + " in " + getFestivalName(festivalId)); - } - // Only add the score to the cabal's overall if it's higher than the other cabal's score. if (offeringScore > otherCabalHighScore) { @@ -4277,21 +4232,11 @@ public class SevenSignsFestival implements SpawnListener // If the spawned NPC ID matches the ones we need, assign their instances. if (npcId == 31127) { - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Instance found for NPC ID 31127 (" + npc.getObjectId() + ")."); - } - _dawnChatGuide = npc; } if (npcId == 31137) { - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Instance found for NPC ID 31137 (" + npc.getObjectId() + ")."); - } - _duskChatGuide = npc; } } @@ -4337,11 +4282,6 @@ public class SevenSignsFestival implements SpawnListener return; } - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Festival manager initialized. Those wishing to participate have " + getMinsToNextFestival() + " minute(s) to sign up."); - } - sendMessageToAll("Festival Guide", "The main event will start in " + getMinsToNextFestival() + " minutes. Please register now."); // Stand by until the allowed signup period has elapsed. @@ -4387,11 +4327,6 @@ public class SevenSignsFestival implements SpawnListener setNextFestivalStart(Config.ALT_FESTIVAL_CYCLE_LENGTH); sendMessageToAll("Festival Guide", "The main event is now starting."); - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: The current set of festivals will begin in " + (Config.ALT_FESTIVAL_FIRST_SPAWN / 60000) + " minute(s)."); - } - // Stand by for a short length of time before starting the festival. try { @@ -4414,11 +4349,6 @@ public class SevenSignsFestival implements SpawnListener festivalInst.sendMessageToParticipants("The festival is about to begin!"); } - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Each of the festivals will end in " + (Config.ALT_FESTIVAL_LENGTH / 60000) + " minutes. New participants can signup then."); - } - // After a short time period, move all idle spawns to the center of the arena. try { @@ -4514,11 +4444,6 @@ public class SevenSignsFestival implements SpawnListener _festivalInitialized = false; sendMessageToAll("Festival Witch", "That will do! I'll move you to the outside soon."); - - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: The next set of festivals begin in " + getMinsToNextFestival() + " minute(s)."); - } } /** @@ -4595,11 +4520,6 @@ public class SevenSignsFestival implements SpawnListener */ protected void festivalInit() { - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Initializing festival for " + SevenSigns.getCabalShortName(_cabal) + " (" + getFestivalName(_levelRange) + ")"); - } - // Teleport all players to arena and notify them. if (_participants.size() > 0) { @@ -4663,11 +4583,6 @@ public class SevenSignsFestival implements SpawnListener SpawnTable.getInstance().addNewSpawn(npcSpawn, false); _witchInst = npcSpawn.doSpawn(); - - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Spawned the Festival Witch " + npcSpawn.getNpcId() + " at " + _witchSpawn._x + " " + _witchSpawn._y + " " + _witchSpawn._z); - } } catch (Exception e) { @@ -4691,11 +4606,6 @@ public class SevenSignsFestival implements SpawnListener */ protected void festivalStart() { - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Starting festival for " + SevenSigns.getCabalShortName(_cabal) + " (" + getFestivalName(_levelRange) + ")"); - } - spawnFestivalMonsters(FESTIVAL_DEFAULT_RESPAWN, 0); } @@ -4704,11 +4614,6 @@ public class SevenSignsFestival implements SpawnListener */ protected void moveMonstersToCenter() { - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Moving spawns to arena center for festival " + SevenSigns.getCabalShortName(_cabal) + " (" + getFestivalName(_levelRange) + ")"); - } - for (L2FestivalMonsterInstance festivalMob : _npcInsts) { if (festivalMob.isDead()) @@ -4825,11 +4730,6 @@ public class SevenSignsFestival implements SpawnListener } _npcInsts.add(festivalMob); - - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Spawned NPC ID " + currSpawn._npcId + " at " + currSpawn._x + " " + currSpawn._y + " " + currSpawn._z); - } } catch (Exception e) { @@ -4852,11 +4752,6 @@ public class SevenSignsFestival implements SpawnListener // Set this flag to true to make sure that this can only be done once. _challengeIncreased = true; - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: " + _participants.get(0).getName() + "'s team have opted to increase the festival challenge!"); - } - // Spawn more festival monsters, but this time with a twist. spawnFestivalMonsters(FESTIVAL_DEFAULT_RESPAWN, 1); return true; @@ -4890,11 +4785,6 @@ public class SevenSignsFestival implements SpawnListener */ protected void festivalEnd() { - if (Config.DEBUG) - { - LOGGER.info("SevenSignsFestival: Ending festival for " + SevenSigns.getCabalShortName(_cabal) + " (" + getFestivalName(_levelRange) + ")"); - } - if (_participants.size() > 0) { for (L2PcInstance participant : _participants) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Castle.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Castle.java index c1c3531457..2fa9cfb50d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Castle.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Castle.java @@ -39,7 +39,6 @@ import com.l2jmobius.gameserver.instancemanager.CrownManager; import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2Manor; import com.l2jmobius.gameserver.model.L2Object; -import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.Announcements; @@ -1234,15 +1233,6 @@ public class Castle public void oustAllPlayers() { - if (Config.DEBUG && (_teleZone != null)) - { - LOGGER.info("Castle Teleport Zone ID: " + _teleZone.getId()); - LOGGER.info("Players Number in Castle Teleport Zone: " + _teleZone.getAllPlayers().size()); - for (L2Character actual : _teleZone.getAllPlayers()) - { - LOGGER.info(" Player Name: " + actual.getName()); - } - } _teleZone.oustAllPlayers(); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java index 27553ca675..c9be5d5b36 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -389,24 +389,6 @@ public class Quest extends ManagedScript */ public synchronized void startQuestTimer(String name, long time, L2NpcInstance npc, L2PcInstance player, boolean repeating) { - if (Config.DEBUG) - { - LOGGER.info("StartingQuestTimer for Quest " + _name); - - String info = "Event:" + name + " Time:" + time; - if (npc != null) - { - info = info + " Npc:" + npc.getName(); - } - - if (player != null) - { - info = info + " Player:" + player.getName(); - } - - LOGGER.info(info + " Repeat:" + repeating); - } - synchronized (_allEventTimers) { ArrayList timers = _allEventTimers.get(name); @@ -1134,11 +1116,6 @@ public class Quest extends ManagedScript */ public static final void playerEnter(L2PcInstance player) { - if (Config.DEBUG) - { - LOGGER.info("Quest.playerEnter " + player.getName()); - } - if (Config.ALT_DEV_NO_QUESTS) { return; @@ -1167,10 +1144,6 @@ public class Quest extends ManagedScript if (q == null) { - if (Config.DEVELOPER) - { - LOGGER.info("Unknown quest " + questId + " for player " + player.getName()); - } if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1207,11 +1180,6 @@ public class Quest extends ManagedScript if (qs == null) { - if (Config.DEVELOPER) - { - LOGGER.info("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); - } - if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/AutoSpawn.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/AutoSpawn.java index a2d012bce5..676bbea213 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/AutoSpawn.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/AutoSpawn.java @@ -28,7 +28,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.Rnd; @@ -92,7 +91,6 @@ public class AutoSpawn private void restoreSpawnData() { - int numLoaded = 0; try (Connection con = DatabaseFactory.getConnection()) { PreparedStatement statement = null; @@ -112,7 +110,6 @@ public class AutoSpawn spawnInst.setSpawnCount(rs.getInt("count")); spawnInst.setBroadcast(rs.getBoolean("broadcastSpawn")); spawnInst.setRandomSpawn(rs.getBoolean("randomSpawn")); - numLoaded++; // Restore the spawn locations for this spawn group/instance. statement2 = con.prepareStatement("SELECT * FROM random_spawn_loc WHERE groupId=?"); @@ -131,11 +128,6 @@ public class AutoSpawn statement.close(); rs.close(); - - if (Config.DEBUG) - { - LOGGER.info("AutoSpawnHandler: Loaded " + numLoaded + " spawn group(s) from the database."); - } } catch (Exception e) { @@ -188,12 +180,6 @@ public class AutoSpawn } setSpawnActive(newSpawn, true); - - if (Config.DEBUG) - { - LOGGER.info("AutoSpawnHandler: Registered auto spawn for NPC ID " + npcId + " (Object ID = " + newId + ")."); - } - return newSpawn; } @@ -245,11 +231,6 @@ public class AutoSpawn return false; } } - - if (Config.DEBUG) - { - LOGGER.info("AutoSpawnHandler: Removed auto spawn for NPC ID " + spawnInst._npcId + " (Object ID = " + spawnInst._objectId + ")."); - } } return true; @@ -585,11 +566,6 @@ public class AutoSpawn Announcements.getInstance().announceToAll("The " + npcInst.getName() + " has spawned near " + nearestTown + "!"); } - if (Config.DEBUG) - { - LOGGER.info("AutoSpawnHandler: Spawned NPC ID " + spawnInst.getNpcId() + " at " + x + ", " + y + ", " + z + " (Near " + nearestTown + ") for " + (spawnInst.getRespawnDelay() / 60000) + " minute(s)."); - } - // If there is no despawn time, do not create a despawn task. if (spawnInst.getDespawnDelay() > 0) { @@ -653,11 +629,6 @@ public class AutoSpawn npcInst.deleteMe(); spawnInst.removeNpcInstance(npcInst); - - if (Config.DEBUG) - { - LOGGER.info("AutoSpawnHandler: Spawns removed for spawn instance (Object ID = " + _objectId + ")."); - } } } catch (Exception e) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2GroupSpawn.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2GroupSpawn.java index 593fa620e2..8151f46eee 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2GroupSpawn.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2GroupSpawn.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.spawn; import java.lang.reflect.Constructor; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.sql.TerritoryTable; import com.l2jmobius.gameserver.idfactory.IdFactory; @@ -105,11 +104,6 @@ public class L2GroupSpawn extends L2Spawn mob.spawnMe(newlocx, newlocy, newlocz); mob.onSpawn(); - if (Config.DEBUG) - { - LOGGER.info("spawned Mob ID: " + _template.npcId + " ,at: " + mob.getX() + " x, " + mob.getY() + " y, " + mob.getZ() + " z"); - } - return mob; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2Spawn.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2Spawn.java index 851cbbd315..9f1085fb94 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2Spawn.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2Spawn.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.sql.TerritoryTable; @@ -561,11 +560,6 @@ public class L2Spawn _lastSpawn = mob; - if (Config.DEBUG) - { - LOGGER.info("spawned Mob ID: " + _template.npcId + " ,at: " + mob.getX() + " x, " + mob.getY() + " y, " + mob.getZ() + " z"); - } - for (Quest quest : mob.getTemplate().getEventQuests(Quest.QuestEventType.ON_SPAWN)) { quest.notifySpawn(mob); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/L2ZoneManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/L2ZoneManager.java index edbed5377a..716d9ba4b1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/L2ZoneManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/L2ZoneManager.java @@ -18,11 +18,8 @@ package com.l2jmobius.gameserver.model.zone; import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.L2Character; -import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; /** * This class manages all zones for a given world region @@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class L2ZoneManager { - private final Logger LOGGER = Logger.getLogger(L2ZoneManager.class.getName()); private final List _zones; /** @@ -61,11 +57,6 @@ public class L2ZoneManager public void revalidateZones(L2Character character) { - if (Config.ZONE_DEBUG && (character != null) && (character instanceof L2PcInstance) && (character.getName() != null)) - { - LOGGER.info("ZONE: Revalidating Zone for character: " + character.getName()); - } - for (L2ZoneType e : _zones) { if (e != null) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 0709164255..adce27c0de 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -18,11 +18,9 @@ package com.l2jmobius.gameserver.model.zone; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Logger; import org.w3c.dom.Node; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -34,7 +32,6 @@ import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; */ public abstract class L2ZoneType { - private final Logger LOGGER = Logger.getLogger(L2ZoneType.class.getName()); private final int _id; protected L2ZoneForm _zone; public Map _characterList; @@ -291,17 +288,6 @@ public abstract class L2ZoneType } } - if (Config.ZONE_DEBUG && (character instanceof L2PcInstance) && ((L2PcInstance) character).isGM()) - { - - LOGGER.info("ZONE: Character " + character.getName() + " has coords: "); - LOGGER.info("ZONE: X: " + character.getX()); - LOGGER.info("ZONE: Y: " + character.getY()); - LOGGER.info("ZONE: Z: " + character.getZ()); - LOGGER.info("ZONE: - is inside zone " + _id + "?: " + _zone.isInsideZone(character.getX(), character.getY(), character.getZ())); - - } - // If the object is inside the zone... if (_zone.isInsideZone(character.getX(), character.getY(), character.getZ())) { @@ -315,25 +301,9 @@ public abstract class L2ZoneType else // Was the character inside this zone? if (_characterList.containsKey(character.getObjectId())) { - if (Config.ZONE_DEBUG && (character instanceof L2PcInstance) && (character.getName() != null)) - { - LOGGER.info("ZONE: Character " + character.getName() + " removed from zone."); - } _characterList.remove(character.getObjectId()); onExit(character); } - - if (Config.ZONE_DEBUG) - { - for (L2Character actual : _characterList.values()) - { - if (actual instanceof L2PcInstance) - { - LOGGER.info("ZONE: - " + actual.getName() + " is inside zone " + _id); - } - } - } - } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2TownZone.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2TownZone.java index bc38506125..b1100c92fe 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2TownZone.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2TownZone.java @@ -123,11 +123,6 @@ public class L2TownZone extends L2ZoneType { return; } - - if (Config.ZONE_DEBUG) - { - ((L2PcInstance) character).sendMessage("You entered " + _townName); - } } if (!_noPeace && (Config.ZONE_TOWN != 2)) @@ -144,15 +139,6 @@ public class L2TownZone extends L2ZoneType { character.setInsideZone(ZoneId.PEACE, false); } - - if (Config.ZONE_DEBUG) - { - if (character instanceof L2PcInstance) - { - ((L2PcInstance) character).sendMessage("You left " + _townName); - } - } - } @Override diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Action.java index 026fffe67e..92cf900f36 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Action.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -49,11 +48,6 @@ public final class Action extends L2GameClientPacket @Override protected void runImpl() { - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": ActionId: " + _actionId + " , ObjectID: " + _objectId); - } - // Get the current L2PcInstance of the player final L2PcInstance activeChar = getClient().getActiveChar(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index c6a5372853..408ede9e74 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -16,17 +16,12 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.thread.LoginServerThread; import com.l2jmobius.gameserver.thread.LoginServerThread.SessionKey; public final class AuthLogin extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(AuthLogin.class.getName()); - // loginName + keys must match what the loginserver used. private String _loginName; private int _playKey1; @@ -48,12 +43,6 @@ public final class AuthLogin extends L2GameClientPacket protected void runImpl() { final SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2); - - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": user: " + _loginName + " key:" + key); - } - final L2GameClient client = getClient(); // avoid potential exploits diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 24841c5acf..7c3f7d6dd3 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -16,16 +16,12 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.position.Location; public final class CannotMoveAnymore extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(CannotMoveAnymore.class.getName()); private int _x; private int _y; private int _z; @@ -50,11 +46,6 @@ public final class CannotMoveAnymore extends L2GameClientPacket return; } - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": 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_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 791a50ede5..2a775d9477 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -89,20 +89,10 @@ public final class CharacterCreate extends L2GameClientPacket { if ((_name.length() < 3) || (_name.length() > 16) || !Util.isAlphaNumeric(_name) || !isValidName(_name)) { - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": charname: " + _name + " is invalid. creation failed."); - } - sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS)); return; } - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": charname: " + _name + " classId: " + _classId); - } - L2PcInstance newChar = null; L2PcTemplate template = null; @@ -111,32 +101,16 @@ public final class CharacterCreate extends L2GameClientPacket { if ((CharNameTable.getInstance().accountCharNumber(getClient().getAccountName()) >= Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT) && (Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT != 0)) { - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": 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) - { - LOGGER.info("DEBUG " + getType() + ": charname: " + _name + " already exists. creation failed."); - } - sendPacket(new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS)); return; } template = CharTemplateTable.getInstance().getTemplate(_classId); - - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": charname: " + _name + " classId: " + _classId + " template: " + template); - } - if ((template == null) || (template.classBaseLevel > 1)) { sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); @@ -185,11 +159,6 @@ public final class CharacterCreate extends L2GameClientPacket private void initNewChar(L2GameClient client, L2PcInstance newChar) { - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": Character init start"); - } - L2World.getInstance().storeObject(newChar); final L2PcTemplate template = newChar.getTemplate(); @@ -311,11 +280,6 @@ public final class CharacterCreate extends L2GameClientPacket { newChar.registerShortCut(new L2ShortCut(10, 0, 2, startSkill.getId(), 1, 1)); } - - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": Adding starter skill:" + startSkill.getId() + " / " + startSkill.getLevel()); - } } startTutorialQuest(newChar); @@ -333,11 +297,6 @@ public final class CharacterCreate extends L2GameClientPacket final CharSelectInfo cl = new CharSelectInfo(client.getAccountName(), client.getSessionId().playOkID1); client.getConnection().sendPacket(cl); client.setCharSelection(cl.getCharInfo()); - - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": Character init end"); - } } public void startTutorialQuest(L2PcInstance player) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index b8e10d7968..c43cdaa8a7 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.GameServer; import com.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import com.l2jmobius.gameserver.network.serverpackets.CharDeleteOk; @@ -46,11 +45,6 @@ public final class CharacterDelete extends L2GameClientPacket return; } - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": deleting slot:" + _charSlot); - } - try { final byte answer = getClient().markToDeleteChar(_charSlot); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java index f197745154..fe377b130f 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.commons.crypt.nProtect; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.L2GameClient.GameClientState; @@ -66,12 +65,6 @@ public class CharacterSelected extends L2GameClientPacket // should always be null but if not then this is repeated packet and nothing should be done here if (getClient().getActiveChar() == null) { - // The L2PcInstance must be created here, so that it can be attached to the L2GameClient - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": selected slot:" + _charSlot); - } - // Load up character from disk final L2PcInstance cha = getClient().loadCharFromDisk(_charSlot); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java index a3c335b4f0..249c3a648a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -27,7 +25,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public final class DlgAnswer extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(DlgAnswer.class.getName()); private int _messageId; private int _answer; private int _requestId; @@ -49,11 +46,6 @@ public final class DlgAnswer extends L2GameClientPacket return; } - if (Config.DEBUG) - { - LOGGER.info(getType() + ": Answer acepted. Message ID " + _messageId + ", asnwer " + _answer + ", unknown field " + _requestId); - } - final Long answerTime = getClient().getActiveChar().getConfirmDlgRequestTime(_requestId); if ((_answer == 1) && (answerTime != null) && (System.currentTimeMillis() > answerTime)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index fb190b571a..19a0a0924b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -139,15 +139,6 @@ public class EnterWorld extends L2GameClientPacket // Register in flood protector // FloodProtector.getInstance().registerNewPlayer(activeChar.getObjectId()); - if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) - { - if (Config.DEBUG) - { - LOGGER.warning("DEBUG " + getType() + ": User already exist in OID map! User " + activeChar.getName() + " is character clone"); - // activeChar.closeNetConnection(); // Do nothing? - } - } - if (!activeChar.isGM() && !activeChar.isDonator() && Config.CHECK_NAME_ON_LOGIN) { if ((activeChar.getName().length() < 3) || (activeChar.getName().length() > 16) || !Util.isAlphaNumeric(activeChar.getName()) || !isValidName(activeChar.getName())) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java index 6a45334b51..a9e400fe83 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.SkillTable; import com.l2jmobius.gameserver.model.L2Party; @@ -32,8 +30,6 @@ import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; public final class Logout extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(Logout.class.getName()); - @Override protected void readImpl() { @@ -67,11 +63,6 @@ public final class Logout extends L2GameClientPacket if (AttackStanceTaskManager.getInstance().getAttackStanceTask(player) && (!player.isGM() || !Config.GM_RESTART_FIGHTING)) { - if (Config.DEBUG) - { - LOGGER.info(getType() + ": Player " + player.getName() + " tried to logout while Fighting"); - } - player.sendPacket(SystemMessageId.CANT_LOGOUT_WHILE_FIGHTING); player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java index 9a718c20a9..4fc40f422e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.sql.CharTemplateTable; import com.l2jmobius.gameserver.model.base.ClassId; import com.l2jmobius.gameserver.network.serverpackets.CharTemplates; @@ -26,8 +23,6 @@ import com.l2jmobius.gameserver.templates.chars.L2PcTemplate; public final class NewCharacter extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(NewCharacter.class.getName()); - @Override protected void readImpl() { @@ -36,11 +31,6 @@ public final class NewCharacter extends L2GameClientPacket @Override protected void runImpl() { - if (Config.DEBUG) - { - LOGGER.info(getType() + ": Create New Char"); - } - final CharTemplates ct = new CharTemplates(); L2PcTemplate template = CharTemplateTable.getInstance().getTemplate(0); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 5c8d3c6d5c..3e2437792d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -40,11 +40,6 @@ public final class ProtocolVersion extends L2GameClientPacket // this packet is never encrypted if ((_version == 65534) || (_version == -2)) // Ping { - if (Config.DEBUG) - { - LOGGER.info("DEBUG " + getType() + ": Ping received"); - } - getClient().close((L2GameServerPacket) null); } else if ((_version == 65533) || (_version == -3)) // RWHO @@ -64,11 +59,6 @@ public final class ProtocolVersion extends L2GameClientPacket } else { - if (Config.DEBUG) - { - LOGGER.info(getType() + ": Client Protocol Revision is ok: " + _version); - } - final KeyPacket pk = new KeyPacket(getClient().enableCrypt()); getClient().sendPacket(pk); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 76529c5278..6f2d620e5b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.datatables.SkillTable; @@ -87,11 +86,6 @@ public final class RequestActionUse extends L2GameClientPacket return; } - if (Config.DEBUG) - { - LOGGER.info(activeChar.getName() + " request Action use: id " + _actionId + " 2:" + _ctrlPressed + " 3:" + _shiftPressed); - } - // dont do anything if player is dead if ((_actionId != 0) && activeChar.isAlikeDead()) { @@ -109,10 +103,7 @@ public final class RequestActionUse extends L2GameClientPacket // don't do anything if player is casting and the action is not a Pet one (skills too) if ((_petActions.contains(_actionId) || (_actionId >= 1000))) { - if (Config.DEBUG) - { - LOGGER.info(activeChar.getName() + " request Pet Action use: id " + _actionId + " ctrl:" + _ctrlPressed + " shift:" + _shiftPressed); - } + // LOGGER.info(activeChar.getName() + " request Pet Action use: id " + _actionId + " ctrl:" + _ctrlPressed + " shift:" + _shiftPressed); } else if (activeChar.isCastingNow()) { @@ -123,11 +114,6 @@ public final class RequestActionUse extends L2GameClientPacket final L2Summon pet = activeChar.getPet(); final L2Object target = activeChar.getTarget(); - if (Config.DEBUG) - { - LOGGER.info("Requested Action ID: " + _actionId); - } - switch (_actionId) { case 0: @@ -152,10 +138,6 @@ public final class RequestActionUse extends L2GameClientPacket { activeChar.sitDown(); } - if (Config.DEBUG) - { - LOGGER.info("new wait type: " + (activeChar.isSitting() ? "SITTING" : "STANDING")); - } break; } case 1: @@ -168,10 +150,6 @@ public final class RequestActionUse extends L2GameClientPacket { activeChar.setRunning(); } - if (Config.DEBUG) - { - LOGGER.info("new move type: " + (activeChar.isRunning() ? "RUNNING" : "WALKIN")); - } break; } case 15: @@ -736,10 +714,6 @@ public final class RequestActionUse extends L2GameClientPacket if (skill == null) { - if (Config.DEBUG) - { - LOGGER.warning("Skill " + skillId + " missing from npcskills.sql for a summon id " + activeSummon.getNpcId()); - } return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index e4f04b4798..5c0fc27055 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -269,11 +269,6 @@ public class RequestAquireSkill extends L2GameClientPacket player.getClan().setReputationScore(player.getClan().getReputationScore() - repCost, true); player.getClan().addNewSkill(skill); - if (Config.DEBUG) - { - LOGGER.info("Learned pledge skill " + _id + " for " + _requiredSp + " SP."); - } - final SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP); cr.addNumber(repCost); player.sendPacket(cr); @@ -295,7 +290,6 @@ public class RequestAquireSkill extends L2GameClientPacket return; } - else { LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - unk1:" + _skillType); @@ -303,12 +297,6 @@ public class RequestAquireSkill extends L2GameClientPacket } player.addSkill(skill, true); - - if (Config.DEBUG) - { - LOGGER.info("Learned skill " + _id + " for " + _requiredSp + " SP."); - } - player.setSp(player.getSp() - _requiredSp); final StatusUpdate su = new StatusUpdate(player.getObjectId()); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java index 4ad70898e0..4cfb037803 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.SkillTable; import com.l2jmobius.gameserver.datatables.sql.SkillSpellbookTable; @@ -32,8 +30,6 @@ import com.l2jmobius.gameserver.network.serverpackets.AquireSkillInfo; public class RequestAquireSkillInfo extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(RequestAquireSkillInfo.class.getName()); - private int _id; private int _level; private int _skillType; @@ -70,10 +66,6 @@ public class RequestAquireSkillInfo extends L2GameClientPacket final L2Skill skill = SkillTable.getInstance().getInfo(_id, _level); if (skill == null) { - if (Config.DEBUG) - { - LOGGER.warning("skill id " + _id + " level " + _level + " is undefined. aquireSkillInfo failed."); - } return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 3d77e4f476..0db6d3466b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -17,9 +17,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -28,8 +26,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class RequestAutoSoulShot extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(RequestAutoSoulShot.class.getName()); - // format cd private int _itemId; private int _type; // 1 = on : 0 = off; @@ -85,13 +81,7 @@ public final class RequestAutoSoulShot extends L2GameClientPacket if ((activeChar.getPrivateStoreType() == 0) && (activeChar.getActiveRequester() == null) && !activeChar.isDead()) { - if (Config.DEBUG) - { - LOGGER.info("AutoSoulShot:" + _itemId); - } - final L2ItemInstance item = activeChar.getInventory().getItemByItemId(_itemId); - if (item != null) { if (_type == 1) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 2c884ca236..3dd1f0d29f 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -102,10 +102,6 @@ public final class RequestBypassToServer extends L2GameClientPacket if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel())) { activeChar.sendMessage("You don't have the access right to use this command!"); - if (Config.DEBUG) - { - LOGGER.warning("Character " + activeChar.getName() + " tried to use admin command " + command + ", but doesn't have access to it!"); - } return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 674720e717..81b1dbc2e7 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -182,29 +182,16 @@ public final class RequestDropItem extends L2GameClientPacket if ((L2Item.TYPE2_QUEST == item.getItem().getType2()) && !activeChar.isGM()) { - if (Config.DEBUG) - { - LOGGER.info(activeChar.getObjectId() + ":player tried to drop quest item"); - } activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_EXCHANGE_ITEM); return; } if (!activeChar.isInsideRadius(_x, _y, 150, false) || (Math.abs(_z - activeChar.getZ()) > 50)) { - if (Config.DEBUG) - { - LOGGER.info(activeChar.getObjectId() + ": trying to drop too far away"); - } activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_DISTANCE_TOO_FAR); return; } - if (Config.DEBUG) - { - LOGGER.info("requested drop item " + _objectId + "(" + item.getCount() + ") at " + _x + "/" + _y + "/" + _z); - } - if (item.isEquipped()) { // Remove augementation boni on unequip @@ -230,12 +217,6 @@ public final class RequestDropItem extends L2GameClientPacket } final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); - - if (Config.DEBUG) - { - LOGGER.info("dropping " + _objectId + " item(" + _count + ") at: " + _x + " " + _y + " " + _z); - } - if ((dropedItem != null) && (dropedItem.getItemId() == 57) && (dropedItem.getCount() >= 1000000) && (Config.RATE_DROP_ADENA <= 200)) { final String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java index ebf28fc2ef..d82af85094 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public final class RequestDuelStart extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(RequestDuelStart.class.getName()); private String _player; private int _partyDuel; @@ -137,11 +133,6 @@ public final class RequestDuelStart extends L2GameClientPacket activeChar.onTransactionRequest(partyLeader); partyLeader.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - LOGGER.info(activeChar.getName() + " requested a duel with " + partyLeader.getName()); - } - SystemMessage msg = new SystemMessage(SystemMessageId.S1S_PARTY_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(partyLeader.getName()); activeChar.sendPacket(msg); @@ -163,11 +154,6 @@ public final class RequestDuelStart extends L2GameClientPacket activeChar.onTransactionRequest(targetChar); targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - if (Config.DEBUG) - { - LOGGER.info(activeChar.getName() + " requested a duel with " + targetChar.getName()); - } - SystemMessage msg = new SystemMessage(SystemMessageId.S1_HAS_BEEN_CHALLENGED_TO_A_DUEL); msg.addString(targetChar.getName()); activeChar.sendPacket(msg); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 0b04f92654..2b563cb23b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.SkillTable; @@ -44,7 +42,6 @@ import com.l2jmobius.gameserver.util.Util; */ public final class RequestExEnchantSkill extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(RequestAquireSkill.class.getName()); private int _skillId; private int _skillLvl; @@ -162,12 +159,6 @@ public final class RequestExEnchantSkill extends L2GameClientPacket if (Rnd.get(100) <= _rate) { player.addSkill(skill, true); - - if (Config.DEBUG) - { - LOGGER.info("Learned skill " + _skillId + " for " + _requiredSp + " SP."); - } - player.getStat().removeExpAndSp(_requiredExp, _requiredSp); final StatusUpdate su = new StatusUpdate(player.getObjectId()); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java index fc2e89caac..da810ebf5d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.BlockList; import com.l2jmobius.gameserver.model.L2Party; import com.l2jmobius.gameserver.model.L2World; @@ -32,8 +29,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class RequestJoinParty extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(RequestJoinParty.class.getName()); - private String _name; private int _itemDistribution; @@ -175,11 +170,6 @@ public final class RequestJoinParty extends L2GameClientPacket target.sendPacket(new AskJoinParty(requestor.getName(), _itemDistribution)); requestor.getParty().setPendingInvitation(true); - if (Config.DEBUG) - { - LOGGER.info("sent out a party invitation to:" + target.getName()); - } - msg = new SystemMessage(SystemMessageId.YOU_INVITED_S1_TO_PARTY); msg.addString(target.getName()); requestor.sendPacket(msg); @@ -189,11 +179,6 @@ public final class RequestJoinParty extends L2GameClientPacket msg = new SystemMessage(SystemMessageId.S1_IS_BUSY_TRY_LATER); msg.addString(target.getName()); requestor.sendPacket(msg); - - if (Config.DEBUG) - { - LOGGER.warning(requestor.getName() + " already received a party invitation"); - } } } @@ -213,11 +198,6 @@ public final class RequestJoinParty extends L2GameClientPacket target.sendPacket(new AskJoinParty(requestor.getName(), _itemDistribution)); requestor.getParty().setPendingInvitation(true); - if (Config.DEBUG) - { - LOGGER.info("sent out a party invitation to:" + target.getName()); - } - msg = new SystemMessage(SystemMessageId.YOU_INVITED_S1_TO_PARTY); msg.addString(target.getName()); requestor.sendPacket(msg); @@ -227,11 +207,6 @@ public final class RequestJoinParty extends L2GameClientPacket msg = new SystemMessage(SystemMessageId.S1_IS_BUSY_TRY_LATER); msg.addString(target.getName()); requestor.sendPacket(msg); - - if (Config.DEBUG) - { - LOGGER.warning(requestor.getName() + " already received a party invitation"); - } } } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index c5b4d51c0f..4fc0b45c0e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2Macro; import com.l2jmobius.gameserver.model.L2Macro.L2MacroCmd; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -26,7 +23,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; public final class RequestMakeMacro extends L2GameClientPacket { - private final Logger LOGGER = Logger.getLogger(RequestMakeMacro.class.getName()); private L2Macro _macro; private int _commandsLenght = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -54,10 +50,6 @@ public final class RequestMakeMacro extends L2GameClientPacket } final L2MacroCmd[] commands = new L2MacroCmd[_count]; - if (Config.DEBUG) - { - LOGGER.info("Make macro id:" + _id + "\tname:" + _name + "\tdesc:" + _desc + "\tacronym:" + _acronym + "\ticon:" + _icon + "\tcount:" + _count); - } for (int i = 0; i < _count; i++) { final int entry = readC(); @@ -67,10 +59,6 @@ public final class RequestMakeMacro extends L2GameClientPacket final String command = readS(); _commandsLenght += command.length() + 1; commands[i] = new L2MacroCmd(entry, type, d1, d2, command); - if (Config.DEBUG) - { - LOGGER.info("entry:" + entry + "\ttype:" + type + "\td1:" + d1 + "\td2:" + d2 + "\tcommand:" + command); - } } _macro = new L2Macro(_id, _icon, _name, _desc, _acronym, commands); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 9b7fe2d42a..04f19f7c09 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.sql.L2PetDataTable; import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.ItemHandler; @@ -85,11 +84,6 @@ public final class RequestPetUseItem extends L2GameClientPacket return; } - if (Config.DEBUG) - { - LOGGER.info(activeChar.getObjectId() + ": pet use item " + _objectId); - } - // check if the item matches the pet if (item.isEquipable()) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java index 126bddb19d..83a7b4769d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.sql.ClanTable; import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -26,8 +23,6 @@ import com.l2jmobius.gameserver.network.serverpackets.PledgeInfo; public final class RequestPledgeInfo extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(RequestPledgeInfo.class.getName()); - private int clanId; @Override @@ -39,11 +34,6 @@ public final class RequestPledgeInfo extends L2GameClientPacket @Override protected void runImpl() { - if (Config.DEBUG) - { - LOGGER.info("infos for clan " + clanId + " requested"); - } - final L2PcInstance activeChar = getClient().getActiveChar(); final L2Clan clan = ClanTable.getInstance().getClan(clanId); @@ -54,10 +44,6 @@ public final class RequestPledgeInfo extends L2GameClientPacket if (clan == null) { - if (Config.DEBUG && (clanId > 0)) - { - LOGGER.info("Clan data for clanId " + clanId + " is missing for player " + activeChar.getName()); - } return; // we have no clan data ?!? should not happen } activeChar.sendPacket(new PledgeInfo(clan)); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index dc2dbcfb62..c9b89911e0 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -65,19 +65,6 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket _items[i] = new ItemRequest(objectId, (int) count, price); } - - if (Config.DEBUG) - { - LOGGER.info("Player " + getClient().getActiveChar().getName() + " requested to buy to storeId " + _storePlayerId + " Items Number: " + _count); - - for (int i = 0; i < _count; i++) - { - LOGGER.info("Requested Item ObjectID: " + _items[i].getObjectId()); - LOGGER.info("Requested Item Id: " + _items[i].getItemId()); - LOGGER.info("Requested Item count: " + _items[i].getCount()); - LOGGER.info("Requested Item price: " + _items[i].getPrice()); - } - } } @Override diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 1daffba372..1f0e6fafee 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -78,20 +78,6 @@ public final class RequestPrivateStoreSell extends L2GameClientPacket return; } - if (Config.DEBUG) - { - LOGGER.info("Player " + getClient().getActiveChar().getName() + " requested to sell to storeId " + _storePlayerId + " Items Number: " + _count); - - for (int i = 0; i < _count; i++) - { - LOGGER.info("Requested Item ObjectID: " + _items[i].getObjectId()); - LOGGER.info("Requested Item Id: " + _items[i].getItemId()); - LOGGER.info("Requested Item count: " + _items[i].getCount()); - LOGGER.info("Requested Item enchant: " + _items[i].getCount()); - LOGGER.info("Requested Item price: " + _items[i].getPrice()); - } - } - _price = (int) priceTotal; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java index a73fd0089a..a0c79a9ded 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.instancemanager.QuestManager; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -29,8 +27,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class RequestQuestAbort extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(RequestQuestAbort.class.getName()); - private int _questId; @Override @@ -66,14 +62,6 @@ public final class RequestQuestAbort extends L2GameClientPacket final QuestList ql = new QuestList(); activeChar.sendPacket(ql); } - else if (Config.DEBUG) - { - LOGGER.info("Player '" + activeChar.getName() + "' try to abort quest " + qe.getName() + " but he didn't have it started."); - } - } - else if (Config.DEBUG) - { - LOGGER.warning("Quest (id='" + _questId + "') not found."); } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java index 1252ec0c45..6d1bd88bd4 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java @@ -16,25 +16,16 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.RecipeController; public final class RequestRecipeBookOpen extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(RequestRecipeBookOpen.class.getName()); - private boolean _isDwarvenCraft; @Override protected void readImpl() { _isDwarvenCraft = readD() == 0; - if (Config.DEBUG) - { - LOGGER.info("RequestRecipeBookOpen : " + (_isDwarvenCraft ? "dwarvenCraft" : "commonCraft")); - } } @Override diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index b915b9b8ed..96bad71e60 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -85,11 +85,6 @@ public final class RequestRestart extends L2GameClientPacket // Check if player is in combat if (AttackStanceTaskManager.getInstance().getAttackStanceTask(player) && (!player.isGM() || !Config.GM_RESTART_FIGHTING)) { - if (Config.DEBUG) - { - LOGGER.info("Player " + player.getName() + " tried to logout while fighting."); - } - player.sendPacket(SystemMessageId.CANT_RESTART_WHILE_FIGHTING); sendPacket(RestartResponse.valueOf(false)); return; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java index ac43381a59..dd50d49ee2 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -28,7 +26,6 @@ import com.l2jmobius.gameserver.util.Util; public class RequestSocialAction extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(RequestSocialAction.class.getName()); private int _actionId; @Override @@ -63,16 +60,8 @@ public class RequestSocialAction extends L2GameClientPacket if ((activeChar.getPrivateStoreType() == 0) && (activeChar.getActiveRequester() == null) && !activeChar.isAlikeDead() && (!activeChar.isAllSkillsDisabled() || activeChar.isInDuel()) && (activeChar.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)) { - if (Config.DEBUG) - { - LOGGER.info("Social Action:" + _actionId); - } - final SocialAction atk = new SocialAction(activeChar.getObjectId(), _actionId); activeChar.broadcastPacket(atk); - /* - * // Schedule a social task to wait for the animation to finish ThreadPoolManager.scheduleGeneral(new SocialTask(this), 2600); activeChar.setIsParalyzed(true); - */ } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 8197970412..8479f1c308 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; @@ -30,9 +27,6 @@ import com.l2jmobius.gameserver.templates.item.L2Item; public class RequestUnEquipItem extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(RequestUnEquipItem.class.getName()); - - // cd private int _slot; /** @@ -47,11 +41,6 @@ public class RequestUnEquipItem extends L2GameClientPacket @Override protected void runImpl() { - if (Config.DEBUG) - { - LOGGER.info("request unequip slot " + _slot); - } - final L2PcInstance activeChar = getClient().getActiveChar(); if (activeChar == null) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index 0b8b88006b..dde95a7233 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -108,11 +108,6 @@ public final class Say2 extends L2GameClientPacket @Override protected void runImpl() { - if (Config.DEBUG) - { - LOGGER.info("Say2: Msg Type = '" + _type + "' Text = '" + _text + "'."); - } - if ((_type < 0) || (_type >= CHAT_NAMES.length)) { LOGGER.warning("Say2: Invalid type: " + _type); @@ -168,10 +163,6 @@ public final class Say2 extends L2GameClientPacket if (_text.length() > Config.MAX_CHAT_LENGTH) { - if (Config.DEBUG) - { - LOGGER.info("Say2: Msg Type = '" + _type + "' Text length more than " + Config.MAX_CHAT_LENGTH + " truncate them."); - } _text = _text.substring(0, Config.MAX_CHAT_LENGTH); // return; } @@ -473,10 +464,6 @@ public final class Say2 extends L2GameClientPacket else { command = _text.substring(1); - if (Config.DEBUG) - { - LOGGER.info("Command: " + command); - } vch = VoicedCommandHandler.getInstance().getVoicedCommandHandler(command); } if (vch != null) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 49d496f491..3262c794ef 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -16,8 +16,6 @@ */ package com.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; @@ -30,8 +28,6 @@ import com.l2jmobius.gameserver.util.Util; public final class TradeRequest extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(TradeRequest.class.getName()); - private int _objectId; @Override @@ -254,11 +250,6 @@ public final class TradeRequest extends L2GameClientPacket if (player.isProcessingTransaction()) { - if (Config.DEBUG) - { - LOGGER.info("Already trading with someone"); - } - player.sendPacket(SystemMessageId.ALREADY_TRADING); player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -266,11 +257,6 @@ public final class TradeRequest extends L2GameClientPacket if (partner.isProcessingRequest() || partner.isProcessingTransaction()) { - if (Config.DEBUG) - { - LOGGER.info("Transaction already in progress."); - } - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_BUSY_TRY_LATER); sm.addString(partner.getName()); player.sendPacket(sm); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java index 156a460f98..649009de8c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -17,7 +17,6 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -46,7 +45,6 @@ import com.l2jmobius.gameserver.util.Util; public final class UseItem extends L2GameClientPacket { - private static Logger LOGGER = Logger.getLogger(UseItem.class.getName()); private int _objectId; @Override @@ -280,11 +278,6 @@ public final class UseItem extends L2GameClientPacket return; } - if (Config.DEBUG) - { - LOGGER.info(activeChar.getObjectId() + ": use item " + _objectId); - } - if (item.isEquipable()) { // No unequipping/equipping while the player is in special conditions @@ -537,8 +530,7 @@ public final class UseItem extends L2GameClientPacket final int tempBodyPart = item.getItem().getBodyPart(); L2ItemInstance tempItem = activeChar.getInventory().getPaperdollItemByL2ItemId(tempBodyPart); - // remove augmentation stats for replaced items - // currently weapons only.. + // remove augmentation stats for replaced items currently weapons only.. if ((tempItem != null) && tempItem.isAugmented()) { tempItem.getAugmentation().removeBonus(activeChar); @@ -646,8 +638,7 @@ public final class UseItem extends L2GameClientPacket activeChar.abortAttack(); activeChar.sendPacket(new EtcStatusUpdate(activeChar)); - // if an "invisible" item has changed (Jewels, helmet), - // we dont need to send broadcast packet to all other users + // if an "invisible" item has changed (Jewels, helmet), we dont need to send broadcast packet to all other users if ((((item.getItem().getBodyPart() & L2Item.SLOT_HEAD) <= 0) && ((item.getItem().getBodyPart() & L2Item.SLOT_NECK) <= 0) && ((item.getItem().getBodyPart() & L2Item.SLOT_L_EAR) <= 0) && ((item.getItem().getBodyPart() & L2Item.SLOT_R_EAR) <= 0) && ((item.getItem().getBodyPart() & L2Item.SLOT_L_FINGER) <= 0) && ((item.getItem().getBodyPart() & L2Item.SLOT_R_FINGER) <= 0))) { activeChar.broadcastUserInfo(); @@ -673,7 +664,6 @@ public final class UseItem extends L2GameClientPacket { final L2Weapon weaponItem = activeChar.getActiveWeaponItem(); final int itemid = item.getItemId(); - // LOGGER.warning( "item not equipable id:"+ item.getItemId()); if (itemid == 4393) { activeChar.sendPacket(new ShowCalculator(4393)); @@ -690,14 +680,7 @@ public final class UseItem extends L2GameClientPacket else { final IItemHandler handler = ItemHandler.getInstance().getItemHandler(itemId); - if (handler == null) - { - if (Config.DEBUG) - { - LOGGER.warning("No item handler registered for item ID " + itemId + "."); - } - } - else + if (handler != null) { handler.useItem(activeChar, item); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index e07909ffef..c1f4da893d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; import com.l2jmobius.gameserver.templates.item.L2Item; @@ -29,8 +26,6 @@ import com.l2jmobius.gameserver.templates.item.L2Item; */ public class EquipUpdate extends L2GameServerPacket { - private static Logger LOGGER = Logger.getLogger(EquipUpdate.class.getName()); - private final L2ItemInstance _item; private final int _change; @@ -126,10 +121,6 @@ public class EquipUpdate extends L2GameServerPacket } } - if (Config.DEBUG) - { - LOGGER.info("body:" + bodypart); - } writeD(bodypart); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 765e4ee597..0bb74784f4 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -18,9 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.ItemInfo; import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; @@ -48,17 +46,11 @@ import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; */ public class InventoryUpdate extends L2GameServerPacket { - private static Logger LOGGER = Logger.getLogger(InventoryUpdate.class.getName()); - private final List _items; public InventoryUpdate() { _items = new ArrayList<>(); - if (Config.DEBUG) - { - showDebug(); - } } /** @@ -67,10 +59,6 @@ public class InventoryUpdate extends L2GameServerPacket public InventoryUpdate(List items) { _items = items; - if (Config.DEBUG) - { - showDebug(); - } } public void addItem(L2ItemInstance item) @@ -119,14 +107,6 @@ public class InventoryUpdate extends L2GameServerPacket } } - private void showDebug() - { - for (ItemInfo item : _items) - { - LOGGER.info("oid:" + Integer.toHexString(item.getObjectId()) + " item:" + item.getItem().getName() + " last change:" + item.getChange()); - } - } - @Override protected final void writeImpl() { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java index d681984cb7..e409ae94d1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -30,8 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class ItemList extends L2GameServerPacket { - private static Logger LOGGER = Logger.getLogger(ItemList.class.getName()); - private final L2ItemInstance[] _items; private final boolean _showWindow; @@ -39,28 +34,12 @@ public class ItemList extends L2GameServerPacket { _items = cha.getInventory().getItems(); _showWindow = showWindow; - if (Config.DEBUG) - { - showDebug(); - } } public ItemList(L2ItemInstance[] items, boolean showWindow) { _items = items; _showWindow = showWindow; - if (Config.DEBUG) - { - showDebug(); - } - } - - private void showDebug() - { - for (L2ItemInstance temp : _items) - { - LOGGER.info("item:" + temp.getItem().getName() + " type1:" + temp.getItem().getType1() + " type2:" + temp.getItem().getType2()); - } } @Override diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index b94a6c9b3b..ed8f89a633 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -18,21 +18,16 @@ package com.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.ItemInfo; import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; /** - * This class ... * @author Yme * @version $Revision: 1.3.2.1.2.5 $ $Date: 2005/03/27 15:29:57 $ Rebuild 23.2.2006 by Advi */ public class PetInventoryUpdate extends L2GameServerPacket { - private static Logger LOGGER = Logger.getLogger(InventoryUpdate.class.getName()); - private final List _items; /** @@ -41,10 +36,6 @@ public class PetInventoryUpdate extends L2GameServerPacket public PetInventoryUpdate(List items) { _items = items; - if (Config.DEBUG) - { - showDebug(); - } } public PetInventoryUpdate() @@ -80,14 +71,6 @@ public class PetInventoryUpdate extends L2GameServerPacket } } - private void showDebug() - { - for (ItemInfo item : _items) - { - LOGGER.info("oid:" + Integer.toHexString(item.getObjectId()) + " item:" + item.getItem().getName() + " last change:" + item.getChange()); - } - } - @Override protected final void writeImpl() { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PetItemList.java index f9e4146dae..66861198f1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance; @@ -28,21 +25,11 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance; */ public class PetItemList extends L2GameServerPacket { - private static Logger LOGGER = Logger.getLogger(PetItemList.class.getName()); - private final L2PetInstance _activeChar; public PetItemList(L2PetInstance character) { _activeChar = character; - if (Config.DEBUG) - { - final L2ItemInstance[] items = _activeChar.getInventory().getItems(); - for (L2ItemInstance temp : items) - { - LOGGER.info("item:" + temp.getItem().getName() + " type1:" + temp.getItem().getType1() + " type2:" + temp.getItem().getType2()); - } - } } @Override diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 3a0dfe7b31..983d3bfcea 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.datatables.csv.RecipeTable; import com.l2jmobius.gameserver.model.L2RecipeList; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -29,8 +26,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class RecipeItemMakeInfo extends L2GameServerPacket { - private static Logger LOGGER = Logger.getLogger(RecipeItemMakeInfo.class.getName()); - private final int _id; private final L2PcInstance _activeChar; private final boolean _success; @@ -53,7 +48,6 @@ public class RecipeItemMakeInfo extends L2GameServerPacket protected final void writeImpl() { final L2RecipeList recipe = RecipeTable.getInstance().getRecipeById(_id); - if (recipe != null) { writeC(0xD7); @@ -64,9 +58,5 @@ public class RecipeItemMakeInfo extends L2GameServerPacket writeD(_activeChar.getMaxMp()); writeD(_success ? 1 : 0); // item creation success/failed } - else if (Config.DEBUG) - { - LOGGER.info("No recipe found with ID = " + _id); - } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java index eb7ce3dff6..fbf6f59e71 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SSQStatus.java @@ -16,9 +16,6 @@ */ package com.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import com.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival; @@ -31,8 +28,6 @@ import com.l2jmobius.gameserver.templates.StatsSet; */ public class SSQStatus extends L2GameServerPacket { - private static Logger LOGGER = Logger.getLogger(SSQStatus.class.getName()); - private final L2PcInstance _activevChar; private final int _page; @@ -141,24 +136,6 @@ public class SSQStatus extends L2GameServerPacket duskPercent = Math.round(((float) duskTotalScore / totalOverallScore) * 100); } - if (Config.DEBUG) - { - LOGGER.info("Dusk Stone Score: " + duskStoneScore + " - Dawn Stone Score: " + dawnStoneScore); - LOGGER.info("Dusk Festival Score: " + duskFestivalScore + " - Dawn Festival Score: " + dawnFestivalScore); - LOGGER.info("Dusk Score: " + duskTotalScore + " - Dawn Score: " + dawnTotalScore); - LOGGER.info("Overall Score: " + totalOverallScore); - LOGGER.info(""); - if (totalStoneScore == 0) - { - LOGGER.info("Dusk Prop: 0 - Dawn Prop: 0"); - } - else - { - LOGGER.info("Dusk Prop: " + ((duskStoneScore / totalStoneScore) * 500) + " - Dawn Prop: " + ((dawnStoneScore / totalStoneScore) * 500)); - } - LOGGER.info("Dusk %: " + duskPercent + " - Dawn %: " + dawnPercent); - } - /* DUSK */ writeD(duskStoneScoreProp); // Seal Stone Score writeD(duskFestivalScore); // Festival Score @@ -230,10 +207,7 @@ 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) - { - LOGGER.info(SevenSigns.getSealName(i, true) + " = Dawn Prop: " + dawnProportion + "(" + ((dawnProportion / totalDawnMembers) * 100) + "%), Dusk Prop: " + duskProportion + "(" + ((duskProportion / totalDuskMembers) * 100) + "%)"); - } + writeC(i); writeC(SevenSigns.getInstance().getSealOwner(i)); if (totalDuskMembers == 0) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SellList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SellList.java index 5c3dee3de4..4c854f8376 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SellList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SellList.java @@ -18,20 +18,16 @@ package com.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.actor.instance.L2MerchantInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; /** - * This class ... * @version $Revision: 1.4.2.3.2.4 $ $Date: 2005/03/27 15:29:39 $ */ public class SellList extends L2GameServerPacket { - private static Logger LOGGER = Logger.getLogger(SellList.class.getName()); private final L2PcInstance _activeChar; private final L2MerchantInstance _lease; private final int _money; @@ -66,10 +62,6 @@ public class SellList extends L2GameServerPacket (item.getObjectId() != _activeChar.getPet().getControlItemId()))) // Pet is summoned and not the item that summoned the pet { _selllist.add(item); - if (Config.DEBUG) - { - LOGGER.info("item added to selllist: " + item.getItem().getName()); - } } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index a8d3f2e586..f7ec88ede8 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.serverpackets; import java.util.Vector; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -38,10 +37,6 @@ public final class SystemMessage extends L2GameServerPacket public SystemMessage(SystemMessageId messageId) { - if (Config.DEBUG && (messageId == SystemMessageId.TARGET_IS_INCORRECT)) - { - Thread.dumpStack(); - } _messageId = messageId.getId(); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 3ebba9a5e1..c249b62395 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -18,9 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -30,8 +28,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public class WareHouseDepositList extends L2GameServerPacket { - private static Logger LOGGER = Logger.getLogger(WareHouseDepositList.class.getName()); - public static final int PRIVATE = 1; public static final int CLAN = 2; public static final int CASTLE = 3; // not sure @@ -76,12 +72,7 @@ public class WareHouseDepositList extends L2GameServerPacket */ writeH(_whType); writeD(_playerAdena); - final int count = _items.size(); - if (Config.DEBUG) - { - LOGGER.info("count:" + count); - } - writeH(count); + writeH(_items.size()); for (L2ItemInstance item : _items) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index c069fbb4fc..699b2d453b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.network.serverpackets; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.actor.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -53,14 +52,6 @@ public class WareHouseWithdrawalList extends L2GameServerPacket return; } _items = _activeChar.getActiveWarehouse().getItems(); - - if (Config.DEBUG) - { - for (L2ItemInstance item : _items) - { - LOGGER.info("item:" + item.getItem().getName() + " type1:" + item.getItem().getType1() + " type2:" + item.getItem().getType2()); - } - } } @Override diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/script/faenor/FaenorInterface.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/script/faenor/FaenorInterface.java index d3175098f4..2acdc15182 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/script/faenor/FaenorInterface.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/script/faenor/FaenorInterface.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.script.faenor; import java.util.List; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2DropCategory; import com.l2jmobius.gameserver.model.L2DropData; import com.l2jmobius.gameserver.model.entity.Announcements; @@ -81,10 +80,6 @@ public class FaenorInterface implements EngineInterface final L2NpcTemplate npc = npcTable.getTemplate(npcID); if (npc == null) { - if (Config.DEBUG) - { - System.out.print("Npc doesnt Exist"); - } throw new NullPointerException(); } final L2DropData drop = new L2DropData(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/scripting/CompiledScriptCache.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/scripting/CompiledScriptCache.java index fd916386e7..a85acd21b4 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/scripting/CompiledScriptCache.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/scripting/CompiledScriptCache.java @@ -27,23 +27,18 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import java.util.logging.Logger; import javax.script.Compilable; import javax.script.CompiledScript; import javax.script.ScriptEngine; import javax.script.ScriptException; -import com.l2jmobius.Config; - /** * Cache of Compiled Scripts * @author KenM */ public class CompiledScriptCache implements Serializable { - private static final Logger LOG = Logger.getLogger(CompiledScriptCache.class.getName()); - private final Map _compiledScriptCache = new HashMap<>(); private transient boolean _modified = false; @@ -55,18 +50,9 @@ public class CompiledScriptCache implements Serializable final CompiledScriptHolder csh = _compiledScriptCache.get(relativeName); if ((csh != null) && csh.matches(file)) { - if (Config.DEBUG) - { - LOG.info("Reusing cached compiled script: " + file); - } return csh.getCompiledScript(); } - if (Config.DEBUG) - { - LOG.info("Compiling script: " + file); - } - final Compilable eng = (Compilable) engine; FileInputStream fis = null; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/Formulas.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/Formulas.java index 4246902ad4..1df9754666 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/Formulas.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/Formulas.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.commons.util.StringUtil; import com.l2jmobius.gameserver.instancemanager.ClanHallManager; import com.l2jmobius.gameserver.instancemanager.ClassDamageManager; import com.l2jmobius.gameserver.instancemanager.SiegeManager; @@ -1230,12 +1229,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.getDistance(festivalCenter[0], festivalCenter[1]); - - if (Config.DEBUG) - { - LOGGER.info("Distance: " + distToCenter + ", RegenMulti: " + ((distToCenter * 2.5) / 50)); - } - return 1.0 - (distToCenter * 0.0005); // Maximum Decreased Regen of ~ -65%; } @@ -1292,14 +1285,6 @@ public final class Formulas final double improvedDamageByCriticalVuln = target.calcStat(Stats.CRIT_VULN, damage, target, skill); final double improvedDamageByCriticalVulnAndAdd = (attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, improvedDamageByCriticalVuln, target, skill)); - if (Config.DEBUG) - { - LOGGER.info("Attacker '" + attacker.getName() + "' Dagger Critical Damage Debug:"); - LOGGER.info(" - Initial Damage: " + damage); - LOGGER.info(" - improvedDamageByCriticalVuln: " + improvedDamageByCriticalVuln); - LOGGER.info(" - improvedDamageByCriticalVulnAndAdd: " + improvedDamageByCriticalVulnAndAdd); - } - damage = improvedDamageByCriticalVulnAndAdd; final L2Effect vicious = attacker.getFirstEffect(312); @@ -1544,17 +1529,6 @@ public final class Formulas final double cAtkVuln = target.calcStat(Stats.CRIT_VULN, 1, target, null); final double improvedDamageByCriticalMulAndVuln = cAtkMultiplied * cAtkVuln; final double improvedDamageByCriticalMulAndAdd = improvedDamageByCriticalMulAndVuln + attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, target, skill); - - if (Config.DEBUG) - { - LOGGER.info("Attacker '" + attacker.getName() + "' Critical Damage Debug:"); - LOGGER.info(" - Initial Damage: " + damage); - LOGGER.info(" - Damage increased of mult: " + cAtkMultiplied); - LOGGER.info(" - cAtkVuln Mult: " + cAtkVuln); - LOGGER.info(" - improvedDamageByCriticalMulAndVuln: " + improvedDamageByCriticalMulAndVuln); - LOGGER.info(" - improvedDamageByCriticalMulAndAdd: " + improvedDamageByCriticalMulAndAdd); - } - damage = improvedDamageByCriticalMulAndAdd; } @@ -2527,13 +2501,6 @@ public final class Formulas rate = skill.getMinChance(); } - if (Config.SKILLSDEBUG) - { - final StringBuilder stat = new StringBuilder(100); - StringUtil.append(stat, skill.getName(), " calcCubicSkillSuccess: ", " type:", skill.getSkillType().toString(), " power:", String.valueOf(value), " stat:", String.format("%1.2f", statModifier), " res:", String.format("%1.2f", resMod), "(", String.format("%1.2f", vulnModifier), ")", " mAtk:", String.format("%1.2f", mAtkModifier), " lvl:", String.valueOf(deltamod), " total:", String.valueOf(rate)); - final String result = stat.toString(); - LOGGER.info(result); - } return (Rnd.get(100) < rate); } @@ -2640,17 +2607,6 @@ public final class Formulas final float physics_mult = getChanceMultiplier(skill); rate *= physics_mult; - if (Config.SKILLSDEBUG) - { - final StringBuilder stat = new StringBuilder(100); - StringUtil.append(stat, " calcSkillSuccess: ", skill.getName(), " ID:", "" + skill.getId(), " type:", skill.getSkillType().toString(), " power:", String.valueOf(value), " stat:", String.format("%1.2f", statModifier), " res:", String.format("%1.2f", resMod), "(", String.format("%1.2f", vulnModifier), " mAtk:", String.format("%1.2f", mAtkModifier), " ss:", String.valueOf(ssModifier), " lvl:", String.valueOf(deltamod), " physics configuration multiplier:", String.valueOf(physics_mult), " total:", String.valueOf(rate)); - final String result = stat.toString(); - if (Config.DEVELOPER) - { - LOGGER.info(result); - } - } - if ((attacker instanceof L2PcInstance) && Config.SEND_SKILLS_CHANCE_TO_PLAYERS) { ((L2PcInstance) attacker).sendMessage("Skill: " + skill.getName() + " Chance: " + rate + "%"); @@ -2764,17 +2720,6 @@ public final class Formulas final float physics_mult = getChanceMultiplier(skill); rate *= physics_mult; - if (Config.SKILLSDEBUG) - { - final StringBuilder stat = new StringBuilder(100); - StringUtil.append(stat, " calcEffectSuccess: ", skill.getName(), " type:", skill.getSkillType().toString(), " power:", String.valueOf(value), " stat:", String.format("%1.2f", statModifier), " res:", String.format("%1.2f", resMod), "(", String.format("%1.2f", vulnModifier), " mAtk:", String.format("%1.2f", mAtkModifier), " ss:", String.valueOf(ssModifier), " lvl:", String.valueOf(deltamod), " physics configuration multiplier:", String.valueOf(physics_mult), " total:", String.valueOf(rate)); - final String result = stat.toString(); - if (Config.DEVELOPER) - { - LOGGER.info(result); - } - } - if ((attacker instanceof L2PcInstance) && Config.SEND_SKILLS_CHANCE_TO_PLAYERS) { ((L2PcInstance) attacker).sendMessage("EffectType " + effect.effectType + " Chance: " + rate + "%"); @@ -3187,17 +3132,7 @@ public final class Formulas if (crit) { final double improvedDamageByCriticalVuln = target.calcStat(Stats.CRIT_VULN, damage, target, skill); - final double improvedDamageByCriticalVulnAndAdd = (attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, improvedDamageByCriticalVuln, target, skill)); - - if (Config.DEBUG) - { - LOGGER.info("Attacker '" + attacker.getName() + "' Charge Skills Critical Damage Debug:"); - LOGGER.info(" - Initial Damage: " + damage); - LOGGER.info(" - improvedDamageByCriticalVuln: " + improvedDamageByCriticalVuln); - LOGGER.info(" - improvedDamageByCriticalVulnAndAdd: " + improvedDamageByCriticalVulnAndAdd); - } - - damage = improvedDamageByCriticalVulnAndAdd; + damage = (attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, improvedDamageByCriticalVuln, target, skill)); } if (skill != null) // skill add is not influenced by criticals improvements, so it's applied later diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/effects/EffectNegate.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/effects/EffectNegate.java index 6b34c2059f..b6789d7c1a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/effects/EffectNegate.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/effects/EffectNegate.java @@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.skills.effects; import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2Effect; import com.l2jmobius.gameserver.model.L2Skill; import com.l2jmobius.gameserver.model.L2Skill.SkillType; @@ -46,12 +45,6 @@ public class EffectNegate extends L2Effect public void onStart() { final L2Skill skill = getSkill(); - - if (Config.DEBUG) - { - LOGGER.info("effectNegate on " + getEffected().getName() + " with skill " + skill.getId()); - } - if (skill.getNegateId() != 0) { getEffected().stopSkillEffects(skill.getNegateId()); @@ -59,11 +52,6 @@ public class EffectNegate extends L2Effect for (String negateSkillType : skill.getNegateSkillTypes()) { - if (Config.DEBUG) - { - LOGGER.info("effectNegate on Type " + negateSkillType + " with power " + skill.getPower()); - } - SkillType type = null; try { @@ -81,11 +69,6 @@ public class EffectNegate extends L2Effect for (String negateEffectType : skill.getNegateEffectTypes()) { - if (Config.DEBUG) - { - LOGGER.info("effectNegate on Effect Type " + negateEffectType + " with power " + skill.getPower()); - } - EffectType type = null; try { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillDrain.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillDrain.java index 4b4e404309..b3f8be8f12 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillDrain.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillDrain.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.skills.l2skills; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2Effect; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Skill; @@ -177,11 +176,6 @@ public class L2SkillDrain extends L2Skill public void useCubicSkill(L2CubicInstance activeCubic, L2Object[] targets) { - if (Config.DEBUG) - { - LOGGER.info("L2SkillDrain: useCubicSkill()"); - } - for (L2Character target : (L2Character[]) targets) { if (target.isAlikeDead() && (getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)) @@ -190,13 +184,7 @@ public class L2SkillDrain extends L2Skill } final boolean mcrit = Formulas.calcMCrit(activeCubic.getMCriticalHit(target, this)); - final int damage = (int) Formulas.calcMagicDam(activeCubic, target, this, mcrit); - if (Config.DEBUG) - { - LOGGER.info("L2SkillDrain: useCubicSkill() -> damage = " + damage); - } - final double hpAdd = _absorbAbs + (_absorbPart * damage); final L2PcInstance owner = activeCubic.getOwner(); final double hp = ((owner.getCurrentHp() + hpAdd) > owner.getMaxHp() ? owner.getMaxHp() : (owner.getCurrentHp() + hpAdd)); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java index 8a3f6ef09d..7d880a90b1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java @@ -16,7 +16,6 @@ */ package com.l2jmobius.gameserver.skills.l2skills; -import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.sql.NpcTable; import com.l2jmobius.gameserver.datatables.xml.ExperienceData; @@ -197,10 +196,6 @@ public class L2SkillSummon extends L2Skill } if (activeChar.getCubics().size() > mastery) { - if (Config.DEBUG) - { - LOGGER.info("player can't summon any more cubics. ignore summon skill"); - } activeChar.sendPacket(SystemMessageId.CUBIC_SUMMONING_FAILED); return; } @@ -211,10 +206,6 @@ public class L2SkillSummon extends L2Skill if ((activeChar.getPet() != null) || activeChar.isMounted()) { - if (Config.DEBUG) - { - LOGGER.info("player has a pet already. ignore summon skill"); - } return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/taskmanager/Task.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/taskmanager/Task.java index ef951c9d34..a749fef760 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/taskmanager/Task.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/taskmanager/Task.java @@ -17,9 +17,7 @@ package com.l2jmobius.gameserver.taskmanager; import java.util.concurrent.ScheduledFuture; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.taskmanager.TaskManager.ExecutedTask; /** @@ -27,14 +25,9 @@ import com.l2jmobius.gameserver.taskmanager.TaskManager.ExecutedTask; */ public abstract class Task { - private static Logger LOGGER = Logger.getLogger(Task.class.getName()); - public void initializate() { - if (Config.DEBUG) - { - LOGGER.info("Task" + getName() + " inializate"); - } + // LOGGER.info("Task" + getName() + " inializated/"); } public ScheduledFuture launchSpecial(ExecutedTask instance) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/thread/LoginServerThread.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/thread/LoginServerThread.java index 26f3be14eb..c68a43f6ae 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/thread/LoginServerThread.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/thread/LoginServerThread.java @@ -37,9 +37,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.crypt.NewCrypt; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.commons.util.Util; import com.l2jmobius.gameserver.GameServer; -import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.L2GameClient; @@ -207,21 +205,12 @@ public class LoginServerThread extends Thread break; } - if (Config.DEBUG) - { - LOGGER.warning("[C]\n" + Util.printData(decrypt)); - } - final int packetType = decrypt[0] & 0xff; switch (packetType) { case 00: { final InitLS init = new InitLS(decrypt); - if (Config.DEBUG) - { - LOGGER.info("Init received"); - } if (init.getRevision() != REVISION) { // TODO: revision mismatch @@ -234,10 +223,6 @@ public class LoginServerThread extends Thread final BigInteger modulus = new BigInteger(init.getRSAKey()); final RSAPublicKeySpec kspec1 = new RSAPublicKeySpec(modulus, RSAKeyGenParameterSpec.F4); _publicKey = (RSAPublicKey) kfac.generatePublic(kspec1); - if (Config.DEBUG) - { - LOGGER.info("RSA key set up"); - } } catch (GeneralSecurityException e) { @@ -247,22 +232,12 @@ public class LoginServerThread extends Thread // send the blowfish key through the rsa encryption final BlowFishKey bfk = new BlowFishKey(_blowfishKey, _publicKey); sendPacket(bfk); - if (Config.DEBUG) - { - LOGGER.info("Sent new blowfish key"); - } + // now, only accept paket with the new encryption _blowfish = new NewCrypt(_blowfishKey); - if (Config.DEBUG) - { - LOGGER.info("Changed blowfish key"); - } + final AuthRequest ar = new AuthRequest(_requestID, _acceptAlternate, _hexID, _gameExternalHost, _gameInternalHost, _gamePort, _reserveHost, _maxPlayer); sendPacket(ar); - if (Config.DEBUG) - { - LOGGER.info("Sent AuthRequest to login"); - } break; } case 01: @@ -344,10 +319,6 @@ public class LoginServerThread extends Thread { if (par.isAuthed()) { - if (Config.DEBUG) - { - LOGGER.info("Login accepted player " + wcToRemove.account + " waited(" + (GameTimeController.getGameTicks() - wcToRemove.timestamp) + "ms)"); - } PlayerInGame pig = new PlayerInGame(par.getAccount()); sendPacket(pig); wcToRemove.gameClient.setState(GameClientState.AUTHED); @@ -432,11 +403,6 @@ public class LoginServerThread extends Thread public void addWaitingClientAndSendRequest(String acc, L2GameClient client, SessionKey key) { - if (Config.DEBUG) - { - LOGGER.info(key.toString()); - } - final WaitingClient wc = new WaitingClient(acc, client, key); synchronized (_waitingClients) @@ -504,31 +470,16 @@ public class LoginServerThread extends Thread { if (savedClient.isDetached()) { - if (Config.DEBUG) - { - LOGGER.info("Old Client was disconnected: Offline or OfflineMode --> Login Again"); - } _accountsInGameServer.put(account, client); - return true; } - if (Config.DEBUG) - { - LOGGER.info("Old Client was online --> Close Old Client Connection"); - } savedClient.closeNow(); _accountsInGameServer.remove(account); return false; } - if (Config.DEBUG) - { - LOGGER.info("Client was not online --> New Client Connection"); - } - _accountsInGameServer.put(account, client); - return true; } @@ -555,11 +506,6 @@ public class LoginServerThread extends Thread { _accountsInGameServer.get(account).closeNow(); getInstance().sendLogout(account); - - if (Config.DEBUG) - { - LOGGER.info("called [doKickPlayer], closing connection"); - } } } @@ -567,10 +513,6 @@ public class LoginServerThread extends Thread { final byte[] array = new byte[size]; Rnd.nextBytes(array); - if (Config.DEBUG) - { - LOGGER.info("Generated random String: \"" + array + "\""); - } return array; } @@ -587,10 +529,6 @@ public class LoginServerThread extends Thread byte[] data = sl.getContent(); NewCrypt.appendChecksum(data); - if (Config.DEBUG) - { - LOGGER.info("[S]\n" + Util.printData(data)); - } data = _blowfish.crypt(data); final int len = data.length + 2; @@ -745,7 +683,6 @@ public class LoginServerThread extends Thread private class WaitingClient { - public int timestamp; public String account; public L2GameClient gameClient; public SessionKey session; @@ -753,7 +690,6 @@ public class LoginServerThread extends Thread public WaitingClient(String acc, L2GameClient client, SessionKey key) { account = acc; - timestamp = GameTimeController.getGameTicks(); gameClient = client; session = key; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java index 7c5b8d3468..129707b558 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java @@ -63,11 +63,6 @@ public class ItemsAutoDestroy public synchronized void removeItems() { - if (Config.DEBUG) - { - LOGGER.info("[ItemsAutoDestroy] : " + _items.size() + " items to check."); - } - if (_items.isEmpty()) { return; @@ -107,11 +102,6 @@ public class ItemsAutoDestroy } } } - - if (Config.DEBUG) - { - LOGGER.info("[ItemsAutoDestroy] : " + _items.size() + " items remaining."); - } } protected class CheckItemsForDestroy extends Thread diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Broadcast.java index 8cc794f187..ad11021af0 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Broadcast.java @@ -17,9 +17,7 @@ package com.l2jmobius.gameserver.util; import java.util.Collection; -import java.util.logging.Logger; -import com.l2jmobius.Config; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -29,8 +27,6 @@ import com.l2jmobius.gameserver.network.serverpackets.RelationChanged; public final class Broadcast { - private static Logger LOGGER = Logger.getLogger(Broadcast.class.getName()); - /** * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character that have the Character targeted.
* Concept :
@@ -42,11 +38,6 @@ public final class Broadcast */ public static void toPlayersTargettingMyself(L2Character character, L2GameServerPacket mov) { - if (Config.DEBUG) - { - LOGGER.info("players to notify:" + character.getKnownList().getKnownPlayers().size() + " packet:" + mov.getClass().getSimpleName()); - } - for (L2PcInstance player : character.getKnownList().getKnownPlayers().values()) { if ((player == null) || (player.getTarget() != character)) @@ -69,11 +60,6 @@ public final class Broadcast */ public static void toKnownPlayers(L2Character character, L2GameServerPacket mov) { - if (Config.DEBUG) - { - LOGGER.info("players to notify:" + character.getKnownList().getKnownPlayers().size() + " packet:" + mov.getClass().getSimpleName()); - } - final Collection knownlist_players = character.getKnownList().getKnownPlayers().values(); for (L2PcInstance player : knownlist_players) @@ -188,11 +174,6 @@ public final class Broadcast */ public static void toAllOnlinePlayers(L2GameServerPacket packet) { - if (Config.DEBUG) - { - LOGGER.info("Players to notify: " + L2World.getAllPlayersCount() + " (with packet " + packet.getClass().getSimpleName() + ")"); - } - for (L2PcInstance onlinePlayer : L2World.getInstance().getAllPlayers()) { if (onlinePlayer == null) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MinionList.java index 8e62143acf..c895e07c86 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MinionList.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; @@ -39,8 +38,6 @@ import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate; */ public class MinionList { - private static Logger LOGGER = Logger.getLogger(L2MonsterInstance.class.getName()); - /** List containing the current spawned minions for this L2MonsterInstance */ private final List minionReferences; protected Map _respawnTasks = new ConcurrentHashMap<>(); @@ -259,10 +256,5 @@ public class MinionList final int newY = master.getY() + spawnConstant; monster.spawnMe(newX, newY, master.getZ()); - - if (Config.DEBUG) - { - LOGGER.info("Spawned minion template " + minionTemplate.npcId + " with objid: " + monster.getObjectId() + " to boss " + master.getObjectId() + " ,at: " + monster.getX() + " x, " + monster.getY() + " y, " + monster.getZ() + " z"); - } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerListener.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerListener.java index 732a9dfca5..622b552c4e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerListener.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerListener.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.net.Socket; import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; import com.l2jmobius.Config; @@ -29,7 +28,6 @@ import com.l2jmobius.Config; */ public class GameServerListener extends FloodProtectedListener { - private static Logger LOGGER = Logger.getLogger(GameServerListener.class.getName()); private static List _gameServers = new ArrayList<>(); public GameServerListener() throws IOException @@ -43,15 +41,9 @@ public class GameServerListener extends FloodProtectedListener @Override public void addClient(Socket s) { - if (Config.DEBUG) - { - LOGGER.info("Received gameserver connection from: " + s.getInetAddress().getHostAddress()); - } - final GameServerThread gst = new GameServerThread(s); gst.start(); _gameServers.add(gst); - } public void removeGameServer(GameServerThread gst) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java index 8b67332afa..c7da27d17b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.crypt.NewCrypt; -import com.l2jmobius.commons.util.Util; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; import com.l2jmobius.loginserver.network.gameserverpackets.BlowFishKey; import com.l2jmobius.loginserver.network.gameserverpackets.ChangeAccessLevel; @@ -153,11 +152,6 @@ public class GameServerThread extends Thread return; } - if (Config.DEBUG) - { - LOGGER.warning("[C]\n" + Util.printData(data)); - } - final int packetType = data[0] & 0xff; switch (packetType) { @@ -226,42 +220,19 @@ public class GameServerThread extends Thread private void onReceiveBlowfishKey(byte[] data) { - /* - * if (_blowfish == null) { - */ BlowFishKey bfk = new BlowFishKey(data, _privateKey); _blowfishKey = bfk.getKey(); _blowfish = new NewCrypt(_blowfishKey); - - if (Config.DEBUG) - { - LOGGER.info("New BlowFish key received, Blowfih Engine initialized:"); - } - /* - * } else { LOGGER.warning("GameServer attempted to re-initialize the blowfish key."); // TODO get a better reason this.forceClose(LoginServerFail.NOT_AUTHED); } - */ } private void onGameServerAuth(byte[] data) throws IOException { - GameServerAuth gsa = new GameServerAuth(data); - - if (Config.DEBUG) - { - LOGGER.info("Auth request received"); - } - - handleRegProcess(gsa); + handleRegProcess(new GameServerAuth(data)); if (isAuthed()) { AuthResponse ar = new AuthResponse(_gsi.getId()); sendPacket(ar); - - if (Config.DEBUG) - { - LOGGER.info("Authed: id: " + _gsi.getId()); - } } } @@ -275,11 +246,6 @@ public class GameServerThread extends Thread for (String account : newAccounts) { _accountsOnGameServer.add(account); - - if (Config.DEBUG) - { - LOGGER.info("Account " + account + " logged in GameServer: [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId())); - } } } else @@ -294,11 +260,6 @@ public class GameServerThread extends Thread { PlayerLogout plo = new PlayerLogout(data); _accountsOnGameServer.remove(plo.getAccount()); - - if (Config.DEBUG) - { - LOGGER.info("Player " + plo.getAccount() + " logged out from gameserver [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId())); - } } else { @@ -326,32 +287,15 @@ public class GameServerThread extends Thread { PlayerAuthRequest par = new PlayerAuthRequest(data); PlayerAuthResponse authResponse; - - if (Config.DEBUG) - { - LOGGER.info("auth request received for Player " + par.getAccount()); - } - SessionKey key = LoginController.getInstance().getKeyForAccount(par.getAccount()); if ((key != null) && key.equals(par.getKey())) { - if (Config.DEBUG) - { - LOGGER.info("auth request: OK"); - } - LoginController.getInstance().removeAuthedLoginClient(par.getAccount()); authResponse = new PlayerAuthResponse(par.getAccount(), true); } else { - if (Config.DEBUG) - { - LOGGER.info("auth request: NO"); - LOGGER.info("session key from self: " + key); - LOGGER.info("session key sent: " + par.getKey()); - } authResponse = new PlayerAuthResponse(par.getAccount(), false); } sendPacket(authResponse); @@ -366,11 +310,7 @@ public class GameServerThread extends Thread { if (isAuthed()) { - if (Config.DEBUG) - { - LOGGER.info("ServerStatus received"); - } - /* ServerStatus ss = */new ServerStatus(data, getServerId()); // server status + new ServerStatus(data, getServerId()); // server status } else { @@ -536,11 +476,6 @@ public class GameServerThread extends Thread { byte[] data = sl.getContent(); NewCrypt.appendChecksum(data); - - if (Config.DEBUG) - { - LOGGER.info("[S] " + sl.getClass().getSimpleName() + ":\n" + Util.printData(data)); - } data = _blowfish.crypt(data); final int len = data.length + 2; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginClient.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginClient.java index 04f4276a88..60b45ba1c2 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginClient.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginClient.java @@ -264,12 +264,6 @@ public final class L2LoginClient extends MMOClient> @Override public void onDisconnection() { - // Closer.getInstance().close(this); - if (Config.DEBUG) - { - LOGGER.info("DISCONNECTED: " + this); - } - LoginController.getInstance().removeLoginClient(this); if (!_joinedGS && (_account != null)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginController.java index 13f52c6bc3..6e42b10060 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginController.java @@ -606,11 +606,6 @@ public class LoginController { lastServer = 1; // minServerId is 1 in Interlude } - - if (Config.DEBUG) - { - LOGGER.info("Account already exists."); - } } rset.close(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 420ae40996..e4387a8f32 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -16,16 +16,11 @@ */ package com.l2jmobius.loginserver.network.serverpackets; -import java.util.logging.Logger; - -import com.l2jmobius.Config; - /** * Fromat: d d: response */ public final class GGAuth extends L2LoginServerPacket { - static final Logger LOGGER = Logger.getLogger(GGAuth.class.getName()); public static final int SKIP_GG_AUTH_REQUEST = 0x0b; private final int _response; @@ -33,11 +28,6 @@ public final class GGAuth extends L2LoginServerPacket public GGAuth(int response) { _response = response; - - if (Config.DEBUG) - { - LOGGER.warning("Reason Hex: " + Integer.toHexString(response)); - } } @Override diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/GameStatusThread.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/GameStatusThread.java index 8b0a846d13..bd903a85eb 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/GameStatusThread.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/GameStatusThread.java @@ -98,30 +98,6 @@ public class GameStatusThread extends Thread private void telnetOutput(int type, String text) { - if (Config.DEVELOPER) - { - if (type == 1) - { - LOGGER.info("TELNET | " + text); - } - else if (type == 2) - { - System.out.print("TELNET | " + text); - } - else if (type == 3) - { - System.out.print(text); - } - else if (type == 4) - { - LOGGER.info(text); - } - else - { - LOGGER.info("TELNET | " + text); - } - } - else // only print output if the message is rejected if (type == 5) { LOGGER.info("TELNET | " + text); @@ -139,11 +115,6 @@ public class GameStatusThread extends Thread telnetOutput(1, "Connection from: " + clientStringIP); // read and loop thru list of IPs, compare with newIP - if (Config.DEVELOPER) - { - telnetOutput(2, ""); - } - InputStream telnetIS = null; try { @@ -153,11 +124,6 @@ public class GameStatusThread extends Thread final String HostList = telnetSettings.getProperty("ListOfHosts", "127.0.0.1,localhost,::1"); - if (Config.DEVELOPER) - { - telnetOutput(3, "Comparing ip to list..."); - } - // compare String ipToCompare = null; for (String ip : HostList.split(",")) @@ -169,19 +135,11 @@ public class GameStatusThread extends Thread { result = true; } - if (Config.DEVELOPER) - { - telnetOutput(3, clientStringIP + " = " + ipToCompare + "(" + ip + ") = " + result); - } } } } catch (IOException e) { - if (Config.DEVELOPER) - { - telnetOutput(4, ""); - } telnetOutput(1, "Error: " + e); } finally @@ -199,10 +157,6 @@ public class GameStatusThread extends Thread } } - if (Config.DEVELOPER) - { - telnetOutput(4, "Allow IP: " + result); - } return result; } @@ -676,10 +630,6 @@ public class GameStatusThread extends Thread } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } } } else if (_usrCommand.startsWith("unjail")) @@ -706,10 +656,6 @@ public class GameStatusThread extends Thread } catch (Exception e) { - if (Config.DEBUG) - { - e.printStackTrace(); - } } } else if (_usrCommand.startsWith("debug") && (_usrCommand.length() > 6)) @@ -999,10 +945,6 @@ public class GameStatusThread extends Thread catch (SQLException se) { _print.println("SQLException while jailing player"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } @@ -1034,10 +976,6 @@ public class GameStatusThread extends Thread catch (SQLException se) { _print.println("SQLException while jailing player"); - if (Config.DEBUG) - { - se.printStackTrace(); - } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/LoginStatusThread.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/LoginStatusThread.java index f75750bcf1..f866ec5526 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/LoginStatusThread.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/LoginStatusThread.java @@ -30,8 +30,8 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.loginserver.GameServerTable; -import com.l2jmobius.loginserver.LoginServer; import com.l2jmobius.loginserver.LoginController; +import com.l2jmobius.loginserver.LoginServer; public class LoginStatusThread extends Thread { @@ -79,11 +79,6 @@ public class LoginStatusThread extends Thread telnetOutput(1, "Connection from: " + clientStringIP); // read and loop thru list of IPs, compare with newIP - if (Config.DEVELOPER) - { - telnetOutput(2, ""); - } - InputStream telnetIS = null; try { @@ -93,11 +88,6 @@ public class LoginStatusThread extends Thread final String HostList = telnetSettings.getProperty("ListOfHosts", "127.0.0.1,localhost,::1"); - if (Config.DEVELOPER) - { - telnetOutput(3, "Comparing ip to list..."); - } - // compare String ipToCompare = null; for (String ip : HostList.split(",")) @@ -109,19 +99,11 @@ public class LoginStatusThread extends Thread { result = true; } - if (Config.DEVELOPER) - { - telnetOutput(3, clientStringIP + " = " + ipToCompare + "(" + ip + ") = " + result); - } } } } catch (IOException e) { - if (Config.DEVELOPER) - { - telnetOutput(4, ""); - } telnetOutput(1, "Error: " + e); } finally @@ -139,10 +121,6 @@ public class LoginStatusThread extends Thread } } - if (Config.DEVELOPER) - { - telnetOutput(4, "Allow IP: " + result); - } return result; }