Removed unnecessary debug checks.

This commit is contained in:
MobiusDev
2019-02-08 05:17:11 +00:00
parent c07feccffa
commit 9f55271f12
166 changed files with 40 additions and 3125 deletions
@@ -24,12 +24,7 @@ AltDevNoRB = False
#------------------------------------------- #-------------------------------------------
# Additional server settings # Additional server settings
#------------------------------------------- #-------------------------------------------
Debug = False
ZoneDebug = False
Assert = 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) # if true the server will be a test server (listed by test server clients only)
TestServer = False TestServer = False
@@ -330,10 +330,6 @@ public class VanHalter extends Quest
rset.close(); rset.close();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("VanHalterManager.loadRoyalGuard: Loaded " + _royalGuardSpawn.size() + " Royal Guard spawn locations.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -405,10 +401,6 @@ public class VanHalter extends Quest
rset.close(); rset.close();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("VanHalterManager.loadTriolRevelation: Loaded " + _triolRevelationSpawn.size() + " Triol's Revelation spawn locations.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -483,10 +475,6 @@ public class VanHalter extends Quest
rset.close(); rset.close();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("VanHalterManager.loadRoyalGuardCaptain: Loaded " + _royalGuardCaptainSpawn.size() + " Royal Guard Captain spawn locations.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -558,10 +546,6 @@ public class VanHalter extends Quest
rset.close(); rset.close();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("VanHalterManager.loadRoyalGuardHelper: Loaded " + _royalGuardHelperSpawn.size() + " Royal Guard Helper spawn locations.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -626,10 +610,6 @@ public class VanHalter extends Quest
rset.close(); rset.close();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("VanHalterManager.loadGuardOfAltar: Loaded " + _guardOfAltarSpawn.size() + " Guard Of Altar spawn locations.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -700,10 +680,6 @@ public class VanHalter extends Quest
rset.close(); rset.close();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("VanHalterManager.loadVanHalter: Loaded High Priestess van Halter spawn locations.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -765,10 +741,6 @@ public class VanHalter extends Quest
rset.close(); rset.close();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("VanHalterManager.loadRitualOffering: Loaded Ritual Offering spawn locations.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -831,10 +803,6 @@ public class VanHalter extends Quest
rset.close(); rset.close();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("VanHalterManager.loadRitualSacrifice: Loaded Ritual Sacrifice spawn locations.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,17 +116,10 @@ ForceGGAuth = False
# IMPORTANT: Put True for server security. # IMPORTANT: Put True for server security.
EnableFloodProtection = True 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) # 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 #for a possible BrutForce
#Reducing this value will increase the likelihood of false positives #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) #Increasing this value will reduce the effectiveness of security (more chance find passwords for large accounts)
@@ -641,11 +641,7 @@ public final class Config
public static boolean ALT_DEV_NO_SPAWNS; public static boolean ALT_DEV_NO_SPAWNS;
public static boolean ALT_DEV_NO_SCRIPT; public static boolean ALT_DEV_NO_SCRIPT;
public static boolean ALT_DEV_NO_RB; public static boolean ALT_DEV_NO_RB;
public static boolean SKILLSDEBUG;
public static boolean DEBUG;
public static boolean ASSERT; public static boolean ASSERT;
public static boolean DEVELOPER;
public static boolean ZONE_DEBUG;
public static boolean SERVER_LIST_TESTSERVER; public static boolean SERVER_LIST_TESTSERVER;
public static boolean BETASERVER; public static boolean BETASERVER;
public static boolean SERVER_LIST_BRACKET; public static boolean SERVER_LIST_BRACKET;
@@ -2300,11 +2296,7 @@ public final class Config
devSettings.load(is); devSettings.load(is);
is.close(); is.close();
SKILLSDEBUG = Boolean.parseBoolean(devSettings.getProperty("SkillsDebug", "false"));
DEBUG = Boolean.parseBoolean(devSettings.getProperty("Debug", "false"));
ASSERT = Boolean.parseBoolean(devSettings.getProperty("Assert", "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")); SERVER_LIST_TESTSERVER = Boolean.parseBoolean(devSettings.getProperty("TestServer", "false"));
BETASERVER = Boolean.parseBoolean(devSettings.getProperty("BetaServer", "false")); BETASERVER = Boolean.parseBoolean(devSettings.getProperty("BetaServer", "false"));
SERVER_LIST_BRACKET = Boolean.valueOf(devSettings.getProperty("ServerListBrackets", "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")); NORMAL_CONNECTION_TIME = Integer.parseInt(serverSettings.getProperty("NormalConnectionTime", "700"));
FAST_CONNECTION_TIME = Integer.parseInt(serverSettings.getProperty("FastConnectionTime", "350")); FAST_CONNECTION_TIME = Integer.parseInt(serverSettings.getProperty("FastConnectionTime", "350"));
MAX_CONNECTION_PER_IP = Integer.parseInt(serverSettings.getProperty("MaxConnectionPerIP", "50")); 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", ""); NETWORK_IP_LIST = serverSettings.getProperty("NetworkList", "");
SESSION_TTL = Long.parseLong(serverSettings.getProperty("SessionTTL", "25000")); SESSION_TTL = Long.parseLong(serverSettings.getProperty("SessionTTL", "25000"));
@@ -19,9 +19,7 @@ package com.l2jmobius.commons.crypt;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.concurrent.ScheduledFuture; 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.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.serverpackets.GameGuardQuery; import com.l2jmobius.gameserver.network.serverpackets.GameGuardQuery;
@@ -32,8 +30,6 @@ import com.l2jmobius.gameserver.network.serverpackets.GameGuardQuery;
*/ */
public class nProtect public class nProtect
{ {
private static Logger LOGGER = Logger.getLogger(nProtect.class.getName());
public enum RestrictionType public enum RestrictionType
{ {
RESTRICT_ENTER, RESTRICT_ENTER,
@@ -117,10 +113,7 @@ public class nProtect
} }
catch (ClassNotFoundException e) 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) catch (SecurityException | InvocationTargetException | IllegalAccessException | IllegalArgumentException | NoSuchMethodException e)
{ {
@@ -35,7 +35,6 @@ public final class L2ObjectHashSet<T extends L2Object>extends L2ObjectSet<T>
protected static final Logger LOGGER = Logger.getLogger(L2ObjectHashSet.class.getName()); protected static final Logger LOGGER = Logger.getLogger(L2ObjectHashSet.class.getName());
private static final boolean TRACE = false; private static final boolean TRACE = false;
private static final boolean DEBUG = Config.DEBUG;
private static final int[] PRIMES = private static final int[] PRIMES =
{ {
@@ -135,36 +134,20 @@ public final class L2ObjectHashSet<T extends L2Object>extends L2ObjectSet<T>
final int size = PRIMES[0]; final int size = PRIMES[0];
_table = (T[]) new L2Object[size]; _table = (T[]) new L2Object[size];
_collisions = new int[(size + 31) >> 5]; _collisions = new int[(size + 31) >> 5];
if (DEBUG)
{
check();
}
} }
/*
* (non-Javadoc)
* @see com.l2jmobius.util.L2ObjectSet#size()
*/
@Override @Override
public int size() public int size()
{ {
return _count; return _count;
} }
/*
* (non-Javadoc)
* @see com.l2jmobius.util.L2ObjectSet#isEmpty()
*/
@Override @Override
public boolean isEmpty() public boolean isEmpty()
{ {
return _count == 0; return _count == 0;
} }
/*
* (non-Javadoc)
* @see com.l2jmobius.util.L2ObjectSet#clear()
*/
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public synchronized void clear() public synchronized void clear()
@@ -173,33 +156,8 @@ public final class L2ObjectHashSet<T extends L2Object>extends L2ObjectSet<T>
_table = (T[]) new L2Object[size]; _table = (T[]) new L2Object[size];
_collisions = new int[(size + 31) >> 5]; _collisions = new int[(size + 31) >> 5];
_count = 0; _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 @Override
public synchronized void put(T obj) public synchronized void put(T obj)
{ {
@@ -243,10 +201,6 @@ public final class L2ObjectHashSet<T extends L2Object>extends L2ObjectSet<T>
{ {
LOGGER.warning("ht: put obj id=" + hashcode + " at slot=" + slot); LOGGER.warning("ht: put obj id=" + hashcode + " at slot=" + slot);
} }
if (DEBUG)
{
check();
}
return; return;
} }
} }
@@ -272,10 +226,6 @@ public final class L2ObjectHashSet<T extends L2Object>extends L2ObjectSet<T>
{ {
LOGGER.warning("ht: put obj id=" + hashcode + " at slot=" + slot); LOGGER.warning("ht: put obj id=" + hashcode + " at slot=" + slot);
} }
if (DEBUG)
{
check();
}
return; return;
} }
} }
@@ -286,17 +236,10 @@ public final class L2ObjectHashSet<T extends L2Object>extends L2ObjectSet<T>
seed += incr; seed += incr;
} }
while (++ntry < _table.length); while (++ntry < _table.length);
if (DEBUG)
{
check();
}
throw new IllegalStateException(); throw new IllegalStateException();
} }
/*
* (non-Javadoc)
* @see com.l2jmobius.util.L2ObjectSet#remove(T)
*/
@Override @Override
public synchronized void remove(T obj) public synchronized void remove(T obj)
{ {
@@ -328,29 +271,18 @@ public final class L2ObjectHashSet<T extends L2Object>extends L2ObjectSet<T>
{ {
LOGGER.warning("ht: remove obj id=" + hashcode + " from slot=" + pos); LOGGER.warning("ht: remove obj id=" + hashcode + " from slot=" + pos);
} }
if (DEBUG)
{
check();
}
return; return;
} }
// check for collision (if we previously deleted element) // check for collision (if we previously deleted element)
if ((_table[pos] == null) && ((_collisions[pos >> 5] & (1 << (pos & 31))) == 0)) if ((_table[pos] == null) && ((_collisions[pos >> 5] & (1 << (pos & 31))) == 0))
{ {
if (DEBUG)
{
check();
}
return; // throw new IllegalArgumentException(); return; // throw new IllegalArgumentException();
} }
// calculate next slot // calculate next slot
seed += incr; seed += incr;
} }
while (++ntry < _table.length); while (++ntry < _table.length);
if (DEBUG)
{
check();
}
throw new IllegalStateException(); throw new IllegalStateException();
} }
@@ -444,16 +376,8 @@ public final class L2ObjectHashSet<T extends L2Object>extends L2ObjectSet<T>
} }
_table = (T[]) newTable; _table = (T[]) newTable;
_collisions = newCollisions; _collisions = newCollisions;
if (DEBUG)
{
check();
}
} }
/*
* (non-Javadoc)
* @see com.l2jmobius.util.L2ObjectSet#iterator()
*/
@Override @Override
public Iterator<T> iterator() public Iterator<T> iterator()
{ {
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config; 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"); LOGGER.warning("Do, please, remove buylists from data folder and use SQL buylist instead");
String line = null; String line = null;
int dummyItemCount = 0;
FileReader reader = null; FileReader reader = null;
BufferedReader buff = null; BufferedReader buff = null;
LineNumberReader lnr = null; LineNumberReader lnr = null;
@@ -112,12 +109,6 @@ public class TradeController
{ {
continue; continue;
} }
dummyItemCount += parseList(line);
}
if (Config.DEBUG)
{
LOGGER.info("created " + dummyItemCount + " Dummy-Items for buylists");
} }
LOGGER.info("TradeController: Loaded " + _lists.size() + " Buylists."); LOGGER.info("TradeController: Loaded " + _lists.size() + " Buylists.");
@@ -172,7 +163,6 @@ public class TradeController
/** /**
* Initialize Shop buylist * Initialize Shop buylist
*/ */
int dummyItemCount = 0;
boolean LimitedItem = false; boolean LimitedItem = false;
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection())
@@ -190,7 +180,6 @@ public class TradeController
if (rset.next()) if (rset.next())
{ {
LimitedItem = false; LimitedItem = false;
dummyItemCount++;
L2TradeList buy1 = new L2TradeList(rset1.getInt("shop_id")); L2TradeList buy1 = new L2TradeList(rset1.getInt("shop_id"));
int itemId = rset.getInt("item_id"); int itemId = rset.getInt("item_id");
@@ -240,7 +229,6 @@ public class TradeController
{ {
while (rset.next()) // TODO aici while (rset.next()) // TODO aici
{ {
dummyItemCount++;
itemId = rset.getInt("item_id"); itemId = rset.getInt("item_id");
price = rset.getInt("price"); price = rset.getInt("price");
count = rset.getInt("count"); count = rset.getInt("count");
@@ -302,13 +290,9 @@ public class TradeController
rset1.close(); rset1.close();
statement1.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 " + _lists.size() + " Buylists.");
LOGGER.info("TradeController: Loaded " + _listsTaskItem.size() + " Limited Buylists."); LOGGER.info("TradeController: Loaded " + _listsTaskItem.size() + " Limited Buylists.");
/* /*
* Restore Task for reinitialyze count of buy item * Restore Task for reinitialyze count of buy item
*/ */
@@ -373,7 +357,6 @@ public class TradeController
if (rset.next()) if (rset.next())
{ {
LimitedItem = false; LimitedItem = false;
dummyItemCount++;
L2TradeList buy1 = new L2TradeList(rset1.getInt("shop_id")); L2TradeList buy1 = new L2TradeList(rset1.getInt("shop_id"));
int itemId = rset.getInt("item_id"); int itemId = rset.getInt("item_id");
int price = rset.getInt("price"); int price = rset.getInt("price");
@@ -420,7 +403,6 @@ public class TradeController
{ {
while (rset.next()) while (rset.next())
{ {
dummyItemCount++;
itemId = rset.getInt("item_id"); itemId = rset.getInt("item_id");
price = rset.getInt("price"); price = rset.getInt("price");
count = rset.getInt("count"); count = rset.getInt("count");
@@ -478,11 +460,6 @@ public class TradeController
rset1.close(); rset1.close();
statement1.close(); statement1.close();
if (Config.DEBUG)
{
LOGGER.info("created " + dummyItemCount + " Dummy-Items for buylists");
}
LOGGER.info("TradeController: Loaded " + (_lists.size() - initialSize) + " Custom 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) public L2TradeList getBuyList(int listId)
{ {
if (_lists.get(new Integer(listId)) != null) if (_lists.get(new Integer(listId)) != null)
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
@@ -209,11 +208,6 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
@Override @Override
public synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1) 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 if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
{ {
// Check if actor is not dead // Check if actor is not dead
@@ -388,11 +382,6 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
*/ */
private void thinkAttack() private void thinkAttack()
{ {
if (Config.DEBUG)
{
_log1.info("L2FortSiegeGuardAI.thinkAttack(); timeout=" + (_attackTimeout - GameTimeController.getGameTicks()));
}
if (_attackTimeout < GameTimeController.getGameTicks()) if (_attackTimeout < GameTimeController.getGameTicks())
{ {
// Check if the actor is running // Check if the actor is running
@@ -38,12 +38,12 @@ public class L2NpcWalkerAI extends L2CharacterAI implements Runnable
* home points for xyz * home points for xyz
*/ */
int _homeX; int _homeX;
/** /**
* home points for xyz * home points for xyz
*/ */
int _homeY; int _homeY;
/** /**
* home points for xyz * home points for xyz
*/ */
@@ -154,10 +154,6 @@ public class L2NpcWalkerAI extends L2CharacterAI implements Runnable
if (delay < 0) if (delay < 0)
{ {
delay = DEFAULT_MOVE_DELAY; 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; _nextMoveTime = System.currentTimeMillis() + delay;
@@ -165,11 +165,6 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
@Override @Override
public void changeIntention(CtrlIntention intention, Object arg0, Object arg1) public void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
{ {
if (Config.DEBUG)
{
LOGGER.info("L2SiegeAI.changeIntention(" + intention + ", " + arg0 + ", " + arg1 + ")");
}
((L2Attackable) _actor).setisReturningToSpawnPoint(false); ((L2Attackable) _actor).setisReturningToSpawnPoint(false);
if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present 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() private void thinkAttack()
{ {
if (Config.DEBUG)
{
LOGGER.info("L2SiegeGuardAI.thinkAttack(); timeout=" + (_attackTimeout - GameTimeController.getGameTicks()));
}
if (_attackTimeout < GameTimeController.getGameTicks()) if (_attackTimeout < GameTimeController.getGameTicks())
{ {
// Check if the actor is running // Check if the actor is running
@@ -23,7 +23,6 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket;
@@ -102,21 +101,11 @@ public class GmListTable
*/ */
public void addGm(L2PcInstance player, boolean hidden) public void addGm(L2PcInstance player, boolean hidden)
{ {
if (Config.DEBUG)
{
LOGGER.info("added gm: " + player.getName());
}
_gmList.put(player, hidden); _gmList.put(player, hidden);
} }
public void deleteGm(L2PcInstance player) public void deleteGm(L2PcInstance player)
{ {
if (Config.DEBUG)
{
LOGGER.info("deleted gm: " + player.getName());
}
_gmList.remove(player); _gmList.remove(player);
} }
@@ -104,10 +104,6 @@ public class DoorTable
{ {
clanhall.getDoors().add(door); clanhall.getDoors().add(door);
door.setClanHall(clanhall); door.setClanHall(clanhall);
if (Config.DEBUG)
{
LOGGER.warning("door " + door.getDoorName() + " attached to ch " + clanhall.getName());
}
} }
} }
@@ -148,14 +148,6 @@ public class AccessLevels
} }
LOGGER.info("AccessLevels: Master Access Level is " + Config.MASTERACCESS_LEVEL); LOGGER.info("AccessLevels: Master Access Level is " + Config.MASTERACCESS_LEVEL);
LOGGER.info("AccessLevels: User Access Level is " + Config.USERACCESS_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());
}
}
} }
/** /**
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.gameserver.datatables.csv.HennaTable; import com.l2jmobius.gameserver.datatables.csv.HennaTable;
import com.l2jmobius.gameserver.model.actor.instance.L2HennaInstance; import com.l2jmobius.gameserver.model.actor.instance.L2HennaInstance;
@@ -99,10 +98,6 @@ public class HennaTreeTable
statement2.close(); statement2.close();
count += list.size(); count += list.size();
if (Config.DEBUG)
{
LOGGER.info("Henna Tree for Class: " + classId + " has " + list.size() + " Henna Templates.");
}
} }
classlist.close(); classlist.close();
@@ -104,15 +104,6 @@ public class AugmentationData
// Use size*4: since theres 4 blocks of stat-data with equivalent size // Use size*4: since theres 4 blocks of stat-data with equivalent size
LOGGER.info("AugmentationData: Loaded: " + (_augmentationStats[0].size() * 4) + " augmentation stats."); 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() public static void reload()
@@ -218,10 +209,6 @@ public class AugmentationData
File file = new File(Config.DATAPACK_ROOT + "/data/stats/augmentation/augmentation_skillmap.xml"); File file = new File(Config.DATAPACK_ROOT + "/data/stats/augmentation/augmentation_skillmap.xml");
if (!file.exists()) if (!file.exists())
{ {
if (Config.DEBUG)
{
LOGGER.info("The augmentation skillmap file is missing.");
}
return; return;
} }
@@ -262,19 +249,11 @@ public class AugmentationData
if (skillId == 0) if (skillId == 0)
{ {
if (Config.DEBUG)
{
LOGGER.warning("Bad skillId in augmentation_skillmap.xml in the augmentationId:" + augmentationId);
}
badAugmantData++; badAugmantData++;
continue; continue;
} }
else if (skillLvL == 0) if (skillLvL == 0)
{ {
if (Config.DEBUG)
{
LOGGER.warning("Bad skillLevel in augmentation_skillmap.xml in the augmentationId:" + augmentationId);
}
badAugmantData++; badAugmantData++;
continue; continue;
} }
@@ -326,11 +305,6 @@ public class AugmentationData
if (!file.exists()) if (!file.exists())
{ {
if (Config.DEBUG)
{
LOGGER.info("The augmentation stat data file " + i + " is missing.");
}
return; 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); return new L2Augmentation(item, ((stat34 << 16) + stat12), skill, true);
} }
@@ -220,11 +220,6 @@ public class ItemTable
item.setItemLootShedule(itemLootShedule); item.setItemLootShedule(itemLootShedule);
} }
if (Config.DEBUG)
{
LOGGER.info("ItemTable: Item created oid: " + item.getObjectId() + " itemid: " + itemId);
}
// Add the L2ItemInstance object to _allObjects of L2world // Add the L2ItemInstance object to _allObjects of L2world
L2World.getInstance().storeObject(item); L2World.getInstance().storeObject(item);
@@ -120,15 +120,7 @@ public class ZoneData
factory.setIgnoringComments(true); factory.setIgnoringComments(true);
File file = new File(Config.DATAPACK_ROOT + "/data/zones/zone.xml"); File file = new File(Config.DATAPACK_ROOT + "/data/zones/zone.xml");
if (!file.exists()) if (file.exists())
{
if (Config.DEBUG)
{
LOGGER.info("The zone.xml file is missing.");
}
}
else
{ {
Document doc = factory.newDocumentBuilder().parse(file); Document doc = factory.newDocumentBuilder().parse(file);
@@ -522,10 +514,6 @@ public class ZoneData
if (temp.getZone().intersectsRectangle(ax, bx, ay, by)) if (temp.getZone().intersectsRectangle(ax, bx, ay, by))
{ {
if (Config.DEBUG)
{
LOGGER.info("Zone (" + zoneId + ") added to: " + x + " " + y);
}
worldRegions[x][y].addZone(temp); worldRegions[x][y].addZone(temp);
} }
} }
@@ -16,13 +16,10 @@
*/ */
package com.l2jmobius.gameserver.handler; package com.l2jmobius.gameserver.handler;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; 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.AdminAdmin;
import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminAio; import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminAio;
import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminAnnouncements; import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminAnnouncements;
@@ -188,23 +185,6 @@ public class AdminCommandHandler
registerAdminCommandHandler(new AdminWho()); registerAdminCommandHandler(new AdminWho());
LOGGER.info("AdminCommandHandler: Loaded " + _datatable.size() + " handlers."); 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) public void registerAdminCommandHandler(IAdminCommandHandler handler)
@@ -212,11 +192,6 @@ public class AdminCommandHandler
String[] ids = handler.getAdminCommandList(); String[] ids = handler.getAdminCommandList();
for (String element : ids) for (String element : ids)
{ {
if (Config.DEBUG)
{
LOGGER.info("Adding handler for command " + element);
}
if (_datatable.keySet().contains(new String(element))) if (_datatable.keySet().contains(new String(element)))
{ {
LOGGER.warning("Duplicated command \"" + element + "\" definition in " + handler.getClass().getName() + "."); LOGGER.warning("Duplicated command \"" + element + "\" definition in " + handler.getClass().getName() + ".");
@@ -237,11 +212,6 @@ public class AdminCommandHandler
command = adminCommand.substring(0, adminCommand.indexOf(" ")); command = adminCommand.substring(0, adminCommand.indexOf(" "));
} }
if (Config.DEBUG)
{
LOGGER.info("getting handler for command: " + command + " -> " + (_datatable.get(command) != null));
}
return _datatable.get(command); return _datatable.get(command);
} }
} }
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
@@ -62,8 +61,6 @@ public class AutoChatHandler implements SpawnListener
private void restoreChatData() private void restoreChatData()
{ {
int numLoaded = 0;
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection())
{ {
PreparedStatement statement = con.prepareStatement("SELECT * FROM auto_chat ORDER BY groupId ASC"); PreparedStatement statement = con.prepareStatement("SELECT * FROM auto_chat ORDER BY groupId ASC");
@@ -71,8 +68,6 @@ public class AutoChatHandler implements SpawnListener
while (rs.next()) while (rs.next())
{ {
numLoaded++;
PreparedStatement statement2 = con.prepareStatement("SELECT * FROM auto_chat_text WHERE groupId=?"); PreparedStatement statement2 = con.prepareStatement("SELECT * FROM auto_chat_text WHERE groupId=?");
statement2.setInt(1, rs.getInt("groupId")); statement2.setInt(1, rs.getInt("groupId"));
ResultSet rs2 = statement2.executeQuery(); ResultSet rs2 = statement2.executeQuery();
@@ -98,11 +93,6 @@ public class AutoChatHandler implements SpawnListener
rs.close(); rs.close();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("AutoChatHandler: Loaded " + numLoaded + " chat group(s) from the database.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -205,12 +195,6 @@ public class AutoChatHandler implements SpawnListener
_registeredChats.remove(chatInst.getNPCId()); _registeredChats.remove(chatInst.getNPCId());
chatInst.setActive(false); chatInst.setActive(false);
if (Config.DEBUG)
{
LOGGER.info("AutoChatHandler: Removed auto chat for NPC ID " + chatInst.getNPCId());
}
return true; return true;
} }
@@ -304,12 +288,6 @@ public class AutoChatHandler implements SpawnListener
_npcId = npcId; _npcId = npcId;
_defaultDelay = chatDelay; _defaultDelay = chatDelay;
_globalChat = isGlobal; _globalChat = isGlobal;
if (Config.DEBUG)
{
LOGGER.info("AutoChatHandler: Registered auto chat for NPC ID " + _npcId + " (Global Chat = " + _globalChat + ").");
}
setActive(true); setActive(true);
} }
@@ -594,11 +572,6 @@ public class AutoChatHandler implements SpawnListener
_chatDelay = chatDelay; _chatDelay = chatDelay;
_chatTexts = chatTexts; _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 global chat isn't enabled for the parent instance, then handle the chat task locally.
if (!chatInst.isGlobal()) 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) for (AutoChatDefinition chatDef : chatDefinitions)
{ {
try try
@@ -847,11 +815,6 @@ public class AutoChatHandler implements SpawnListener
{ {
nearbyGM.sendPacket(cs); 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) catch (Exception e)
{ {
@@ -84,21 +84,12 @@ public class UserCommandHandler
for (int id : ids) for (int id : ids)
{ {
if (Config.DEBUG)
{
LOGGER.info("Adding handler for user command " + id);
}
_datatable.put(new Integer(id), handler); _datatable.put(new Integer(id), handler);
} }
} }
public IUserCommandHandler getUserCommandHandler(int userCommand) public IUserCommandHandler getUserCommandHandler(int userCommand)
{ {
if (Config.DEBUG)
{
LOGGER.info("getting handler for user command: " + userCommand);
}
return _datatable.get(new Integer(userCommand)); return _datatable.get(new Integer(userCommand));
} }
@@ -111,14 +111,8 @@ public class VoicedCommandHandler
public void registerVoicedCommandHandler(IVoicedCommandHandler handler) public void registerVoicedCommandHandler(IVoicedCommandHandler handler)
{ {
String[] ids = handler.getVoicedCommandList(); String[] ids = handler.getVoicedCommandList();
for (String id : ids) for (String id : ids)
{ {
if (Config.DEBUG)
{
LOGGER.info("Adding handler for command " + id);
}
_datatable.put(id, handler); _datatable.put(id, handler);
} }
} }
@@ -126,17 +120,10 @@ public class VoicedCommandHandler
public IVoicedCommandHandler getVoicedCommandHandler(String voicedCommand) public IVoicedCommandHandler getVoicedCommandHandler(String voicedCommand)
{ {
String command = voicedCommand; String command = voicedCommand;
if (voicedCommand.indexOf(" ") != -1) if (voicedCommand.indexOf(" ") != -1)
{ {
command = voicedCommand.substring(0, voicedCommand.indexOf(" ")); command = voicedCommand.substring(0, voicedCommand.indexOf(" "));
} }
if (Config.DEBUG)
{
LOGGER.info("getting handler for command: " + command + " -> " + (_datatable.get(command) != null));
}
return _datatable.get(command); return _datatable.get(command);
} }
@@ -276,10 +276,7 @@ public class AdminAdmin implements IAdminCommandHandler
} }
catch (NumberFormatException e) catch (NumberFormatException e)
{ {
if (Config.DEBUG) LOGGER.warning(e.getMessage());
{
LOGGER.warning("Impossible to parse to integer the string " + mode_s + ", exception " + e.getMessage());
}
} }
} }
@@ -199,12 +199,7 @@ public class AdminAio implements IAdminCommandHandler
} }
catch (Exception e) catch (Exception e)
{ {
if (Config.DEBUG) LOGGER.warning("Could not set Aio stats to char: " + e);
{
e.printStackTrace();
}
LOGGER.warning("could not set Aio stats to char: " + e);
} }
} }
else else
@@ -237,12 +232,7 @@ public class AdminAio implements IAdminCommandHandler
} }
catch (Exception e) catch (Exception e)
{ {
if (Config.DEBUG) LOGGER.warning("Could not remove Aio stats of char: " + e);
{
e.printStackTrace();
}
LOGGER.warning("could not remove Aio stats of char: " + e);
} }
} }
@@ -330,10 +330,6 @@ public class AdminBan implements IAdminCommandHandler
catch (SQLException se) catch (SQLException se)
{ {
BuilderUtil.sendSysMessage(activeChar, "SQLException while chat-banning player"); 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) catch (SQLException se)
{ {
BuilderUtil.sendSysMessage(activeChar, "SQLException while jailing player"); BuilderUtil.sendSysMessage(activeChar, "SQLException while jailing player");
if (Config.DEBUG)
{
se.printStackTrace();
}
} }
} }
@@ -398,10 +390,6 @@ public class AdminBan implements IAdminCommandHandler
catch (SQLException se) catch (SQLException se)
{ {
BuilderUtil.sendSysMessage(activeChar, "SQLException while jailing player"); BuilderUtil.sendSysMessage(activeChar, "SQLException while jailing player");
if (Config.DEBUG)
{
se.printStackTrace();
}
} }
} }
@@ -460,10 +448,6 @@ public class AdminBan implements IAdminCommandHandler
catch (SQLException se) catch (SQLException se)
{ {
BuilderUtil.sendSysMessage(activeChar, "SQLException while changing character's access level"); BuilderUtil.sendSysMessage(activeChar, "SQLException while changing character's access level");
if (Config.DEBUG)
{
se.printStackTrace();
}
} }
} }
return output; return output;
@@ -946,14 +946,6 @@ public class AdminEditChar implements IAdminCommandHandler
{ {
LOGGER.warning("listCharacters: found player null into L2World Instance.."); 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()]); L2PcInstance[] players = online_players_list.toArray(new L2PcInstance[online_players_list.size()]);
@@ -1177,11 +1169,6 @@ public class AdminEditChar implements IAdminCommandHandler
// Admin information // Admin information
player.sendMessage("Changed stats of " + player.getName() + ". HP: " + hpval + " MP: " + mpval + " CP: " + cpval + " PvP: " + pvpflagval + " / " + pvpkillsval); 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 showCharacterInfo(activeChar, null); // Back to start
player.broadcastUserInfo(); player.broadcastUserInfo();
@@ -17,9 +17,7 @@
package com.l2jmobius.gameserver.handler.admincommandhandlers; package com.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -36,8 +34,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil;
*/ */
public class AdminExpSp implements IAdminCommandHandler public class AdminExpSp implements IAdminCommandHandler
{ {
private static Logger LOGGER = Logger.getLogger(AdminExpSp.class.getName());
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_add_exp_sp_to_character", "admin_add_exp_sp_to_character",
@@ -164,11 +160,6 @@ public class AdminExpSp implements IAdminCommandHandler
player.addExpAndSp(expval, spval); player.addExpAndSp(expval, spval);
// Admin information // Admin information
BuilderUtil.sendSysMessage(activeChar, "Added " + expval + " xp and " + spval + " sp to " + player.getName() + "."); 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; return true;
@@ -219,11 +210,6 @@ public class AdminExpSp implements IAdminCommandHandler
player.removeExpAndSp(expval, spval); player.removeExpAndSp(expval, spval);
// Admin information // Admin information
BuilderUtil.sendSysMessage(activeChar, "Removed " + expval + " xp and " + spval + " sp from " + player.getName() + "."); 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; return true;
@@ -16,9 +16,6 @@
*/ */
package com.l2jmobius.gameserver.handler.admincommandhandlers; 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.datatables.GmListTable;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil;
*/ */
public class AdminGm implements IAdminCommandHandler public class AdminGm implements IAdminCommandHandler
{ {
private static Logger LOGGER = Logger.getLogger(AdminGm.class.getName());
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_gm" "admin_gm"
@@ -59,21 +55,11 @@ public class AdminGm implements IAdminCommandHandler
{ {
GmListTable.getInstance().deleteGm(activeChar); GmListTable.getInstance().deleteGm(activeChar);
BuilderUtil.sendSysMessage(activeChar, "You no longer have GM status."); 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 else
{ {
GmListTable.getInstance().addGm(activeChar, false); GmListTable.getInstance().addGm(activeChar, false);
BuilderUtil.sendSysMessage(activeChar, "You now have GM status."); BuilderUtil.sendSysMessage(activeChar, "You now have GM status.");
if (Config.DEBUG)
{
LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") turned his GM status on");
}
} }
} }
} }
@@ -16,9 +16,6 @@
*/ */
package com.l2jmobius.gameserver.handler.admincommandhandlers; 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.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.L2World;
@@ -34,8 +31,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil;
*/ */
public class AdminHeal implements IAdminCommandHandler public class AdminHeal implements IAdminCommandHandler
{ {
private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName());
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_heal" "admin_heal"
@@ -129,11 +124,6 @@ public class AdminHeal implements IAdminCommandHandler
{ {
target.setCurrentCp(target.getMaxCp()); target.setCurrentCp(target.getMaxCp());
} }
if (Config.DEBUG)
{
LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") healed character " + target.getName());
}
} }
else else
{ {
@@ -17,7 +17,6 @@
package com.l2jmobius.gameserver.handler.admincommandhandlers; package com.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.logging.Logger;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -36,8 +35,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil;
*/ */
public class AdminKill implements IAdminCommandHandler public class AdminKill implements IAdminCommandHandler
{ {
private static Logger LOGGER = Logger.getLogger(AdminKill.class.getName());
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_kill", "admin_kill",
@@ -152,11 +149,6 @@ public class AdminKill implements IAdminCommandHandler
{ {
target.reduceCurrentHp(target.getMaxHp() + 1, activeChar); target.reduceCurrentHp(target.getMaxHp() + 1, activeChar);
} }
if (Config.DEBUG)
{
LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") killed character " + target.getObjectId());
}
} }
@Override @Override
@@ -17,9 +17,7 @@
package com.l2jmobius.gameserver.handler.admincommandhandlers; package com.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.datatables.sql.ClanTable; import com.l2jmobius.gameserver.datatables.sql.ClanTable;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2Clan;
@@ -42,8 +40,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil;
*/ */
public class AdminPledge implements IAdminCommandHandler public class AdminPledge implements IAdminCommandHandler
{ {
private final Logger LOGGER = Logger.getLogger(AdminPledge.class.getName());
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_pledge" "admin_pledge"
@@ -227,10 +223,6 @@ public class AdminPledge implements IAdminCommandHandler
} }
} }
} }
if (Config.DEBUG)
{
LOGGER.info("fixme:action is null");
}
} }
default: default:
{ {
@@ -16,9 +16,6 @@
*/ */
package com.l2jmobius.gameserver.handler.admincommandhandlers; 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.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.L2World;
@@ -35,7 +32,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil;
*/ */
public class AdminRes implements IAdminCommandHandler public class AdminRes implements IAdminCommandHandler
{ {
private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName());
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_res", "admin_res",
@@ -124,11 +120,6 @@ public class AdminRes implements IAdminCommandHandler
} }
doResurrect((L2Character) obj); doResurrect((L2Character) obj);
if (Config.DEBUG)
{
LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") resurrected character " + obj.getObjectId());
}
} }
private void handleNonPlayerRes(L2PcInstance activeChar) private void handleNonPlayerRes(L2PcInstance activeChar)
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.TradeController; import com.l2jmobius.gameserver.TradeController;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.L2TradeList; import com.l2jmobius.gameserver.model.L2TradeList;
@@ -87,15 +86,10 @@ public class AdminShop implements IAdminCommandHandler
if (list != null) if (list != null)
{ {
activeChar.sendPacket(new BuyList(list, activeChar.getAdena())); activeChar.sendPacket(new BuyList(list, activeChar.getAdena()));
if (Config.DEBUG)
{
LOGGER.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") opened GM shop id " + val);
}
} }
else else
{ {
LOGGER.warning("no buylist with id:" + val); LOGGER.warning("No buylist with id:" + val);
} }
activeChar.sendPacket(ActionFailed.STATIC_PACKET); activeChar.sendPacket(ActionFailed.STATIC_PACKET);
@@ -17,9 +17,7 @@
package com.l2jmobius.gameserver.handler.admincommandhandlers; package com.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.datatables.SkillTable; import com.l2jmobius.gameserver.datatables.SkillTable;
import com.l2jmobius.gameserver.datatables.sql.SkillTreeTable; import com.l2jmobius.gameserver.datatables.sql.SkillTreeTable;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -39,8 +37,6 @@ import com.l2jmobius.gameserver.util.BuilderUtil;
*/ */
public class AdminSkill implements IAdminCommandHandler public class AdminSkill implements IAdminCommandHandler
{ {
private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName());
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_show_skills", "admin_show_skills",
@@ -499,12 +495,6 @@ public class AdminSkill implements IAdminCommandHandler
player.addSkill(skill, true); player.addSkill(skill, true);
// Admin information // Admin information
BuilderUtil.sendSysMessage(activeChar, "You gave the skill " + name + " to " + player.getName() + "."); 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(); activeChar.sendSkillList();
} }
else else
@@ -540,12 +530,6 @@ public class AdminSkill implements IAdminCommandHandler
player.removeSkill(skill); player.removeSkill(skill);
// Admin information // Admin information
BuilderUtil.sendSysMessage(activeChar, "You removed the skill " + skillname + " from " + player.getName() + "."); 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(); activeChar.sendSkillList();
} }
else else
@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.datatables.csv.MapRegionTable; import com.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import com.l2jmobius.gameserver.datatables.sql.NpcTable; import com.l2jmobius.gameserver.datatables.sql.NpcTable;
@@ -636,12 +635,6 @@ public class AdminTeleport implements IAdminCommandHandler
SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2);
sm.addString("Created " + template1.name + " on " + target.getObjectId() + "."); sm.addString("Created " + template1.name + " on " + target.getObjectId() + ".");
activeChar.sendPacket(sm); 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) catch (Exception e)
{ {
@@ -904,10 +904,6 @@ public class Potions implements IItemHandler
final L2ItemInstance item = activeChar.getInventory().getItemByItemId(potion); final L2ItemInstance item = activeChar.getInventory().getItemByItemId(potion);
activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false); 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) else if (playable instanceof L2Summon)
{ {
@@ -918,10 +914,6 @@ public class Potions implements IItemHandler
final L2ItemInstance item = activeChar.getInventory().getItemByItemId(potion); final L2ItemInstance item = activeChar.getInventory().getItemByItemId(potion);
activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false); activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false);
} }
else if (Config.DEBUG)
{
LOGGER.warning("Attention: playable " + playable.getName() + " has not potions " + potion + "!");
}
} }
} }
} }
@@ -67,11 +67,6 @@ public class Harvest implements ISkillHandler
return; return;
} }
if (Config.DEBUG)
{
LOGGER.info("Casting harvest");
}
for (L2Object aTargetList : targetList) for (L2Object aTargetList : targetList)
{ {
if (!(aTargetList instanceof L2MonsterInstance)) if (!(aTargetList instanceof L2MonsterInstance))
@@ -18,9 +18,7 @@ package com.l2jmobius.gameserver.handler.skillhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.datatables.SkillTable; import com.l2jmobius.gameserver.datatables.SkillTable;
import com.l2jmobius.gameserver.handler.ISkillHandler; import com.l2jmobius.gameserver.handler.ISkillHandler;
@@ -45,8 +43,6 @@ import com.l2jmobius.gameserver.templates.item.L2WeaponType;
public class Pdam implements ISkillHandler public class Pdam implements ISkillHandler
{ {
private static Logger LOGGER = Logger.getLogger(Pdam.class.getName());
private static final SkillType[] SKILL_IDS = private static final SkillType[] SKILL_IDS =
{ {
SkillType.PDAM, SkillType.PDAM,
@@ -64,11 +60,6 @@ public class Pdam implements ISkillHandler
int damage = 0; int damage = 0;
if (Config.DEBUG)
{
LOGGER.info("Begin Skill processing in Pdam.java " + skill.getSkillType());
}
// Calculate targets based on vegeance // Calculate targets based on vegeance
final List<L2Object> target_s = new ArrayList<>(); final List<L2Object> target_s = new ArrayList<>();
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.handler.skillhandlers;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.handler.ISkillHandler; import com.l2jmobius.gameserver.handler.ISkillHandler;
@@ -66,11 +65,6 @@ public class Sow implements ISkillHandler
return; return;
} }
if (Config.DEBUG)
{
LOGGER.info("Casting sow");
}
for (int index = 0; index < targetList.length; index++) for (int index = 0; index < targetList.length; index++)
{ {
if (!(targetList[0] instanceof L2MonsterInstance)) if (!(targetList[0] instanceof L2MonsterInstance))
@@ -20,7 +20,6 @@ import java.util.BitSet;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.PrimeFinder; import com.l2jmobius.commons.util.PrimeFinder;
@@ -70,10 +69,6 @@ public class BitSetIDFactory extends IdFactory
final int objectID = usedObjectId - FIRST_OID; final int objectID = usedObjectId - FIRST_OID;
if (objectID < 0) if (objectID < 0)
{ {
if (Config.DEBUG)
{
LOGGER.warning("Object ID " + usedObjectId + " in DB is less than minimum ID of " + FIRST_OID);
}
continue; continue;
} }
_freeIds.set(usedObjectId - FIRST_OID); _freeIds.set(usedObjectId - FIRST_OID);
@@ -79,11 +79,6 @@ public class BoatManager
L2BoatInstance boat = parseLine(line); L2BoatInstance boat = parseLine(line);
boat.spawn(); boat.spawn();
_staticItems.put(boat.getObjectId(), boat); _staticItems.put(boat.getObjectId(), boat);
if (Config.DEBUG)
{
LOGGER.info("Boat ID : " + boat.getObjectId());
}
} }
} }
catch (FileNotFoundException e) catch (FileNotFoundException e)
@@ -96,11 +96,7 @@ public class CursedWeaponsManager
private final void load() private final void load()
{ {
LOGGER.info("Initializing CursedWeaponsManager"); LOGGER.info("Initializing CursedWeaponsManager.");
if (Config.DEBUG)
{
LOGGER.info("Loading data: ");
}
try try
{ {
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -110,10 +106,6 @@ public class CursedWeaponsManager
final File file = new File(Config.DATAPACK_ROOT + "/data/cursedWeapons.xml"); final File file = new File(Config.DATAPACK_ROOT + "/data/cursedWeapons.xml");
if (!file.exists()) if (!file.exists())
{ {
if (Config.DEBUG)
{
LOGGER.info("NO FILE");
}
return; return;
} }
@@ -447,10 +447,6 @@ public class FourSepulchersManager extends GrandBossManager
SpawnTable.getInstance().addNewSpawn(spawnDat, false); SpawnTable.getInstance().addNewSpawn(spawnDat, false);
spawnDat.doSpawn(); spawnDat.doSpawn();
spawnDat.startRespawn(); spawnDat.startRespawn();
if (Config.DEBUG)
{
LOGGER.info("FourSepulchersManager: spawned " + spawnDat.getTemplate().getName());
}
} }
catch (SecurityException e) catch (SecurityException e)
{ {
@@ -587,10 +583,6 @@ public class FourSepulchersManager extends GrandBossManager
rset.close(); rset.close();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("FourSepulchersManager: loaded " + _mysteriousBoxSpawns.size() + " Mysterious-Box spawns.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -637,7 +629,6 @@ public class FourSepulchersManager extends GrandBossManager
{ {
_physicalMonsters.clear(); _physicalMonsters.clear();
int loaded = 0;
try (Connection con = DatabaseFactory.getConnection()) 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"); 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")); spawnDat.setRespawnDelay(rset2.getInt("respawn_delay"));
SpawnTable.getInstance().addNewSpawn(spawnDat, false); SpawnTable.getInstance().addNewSpawn(spawnDat, false);
_physicalSpawns.add(spawnDat); _physicalSpawns.add(spawnDat);
loaded++;
} }
else else
{ {
@@ -686,10 +676,6 @@ public class FourSepulchersManager extends GrandBossManager
rset1.close(); rset1.close();
statement1.close(); statement1.close();
if (Config.DEBUG)
{
LOGGER.info("FourSepulchersManager: loaded " + loaded + " Physical type monsters spawns.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -702,7 +688,6 @@ public class FourSepulchersManager extends GrandBossManager
{ {
_magicalMonsters.clear(); _magicalMonsters.clear();
int loaded = 0;
try (Connection con = DatabaseFactory.getConnection()) 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"); 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")); spawnDat.setRespawnDelay(rset2.getInt("respawn_delay"));
SpawnTable.getInstance().addNewSpawn(spawnDat, false); SpawnTable.getInstance().addNewSpawn(spawnDat, false);
_magicalSpawns.add(spawnDat); _magicalSpawns.add(spawnDat);
loaded++;
} }
else else
{ {
@@ -751,10 +735,6 @@ public class FourSepulchersManager extends GrandBossManager
rset1.close(); rset1.close();
statement1.close(); statement1.close();
if (Config.DEBUG)
{
LOGGER.info("FourSepulchersManager: loaded " + loaded + " Magical type monsters spawns.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -768,7 +748,6 @@ public class FourSepulchersManager extends GrandBossManager
_dukeFinalMobs.clear(); _dukeFinalMobs.clear();
_archonSpawned.clear(); _archonSpawned.clear();
int loaded = 0;
try (Connection con = DatabaseFactory.getConnection()) 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"); 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")); spawnDat.setRespawnDelay(rset2.getInt("respawn_delay"));
SpawnTable.getInstance().addNewSpawn(spawnDat, false); SpawnTable.getInstance().addNewSpawn(spawnDat, false);
_dukeFinalSpawns.add(spawnDat); _dukeFinalSpawns.add(spawnDat);
loaded++;
} }
else else
{ {
@@ -818,10 +796,6 @@ public class FourSepulchersManager extends GrandBossManager
rset1.close(); rset1.close();
statement1.close(); statement1.close();
if (Config.DEBUG)
{
LOGGER.info("FourSepulchersManager: loaded " + loaded + " Church of duke monsters spawns.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -834,7 +808,6 @@ public class FourSepulchersManager extends GrandBossManager
{ {
_emperorsGraveNpcs.clear(); _emperorsGraveNpcs.clear();
int loaded = 0;
try (Connection con = DatabaseFactory.getConnection()) 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"); 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")); spawnDat.setRespawnDelay(rset2.getInt("respawn_delay"));
SpawnTable.getInstance().addNewSpawn(spawnDat, false); SpawnTable.getInstance().addNewSpawn(spawnDat, false);
_emperorsGraveSpawns.add(spawnDat); _emperorsGraveSpawns.add(spawnDat);
loaded++;
} }
else else
{ {
@@ -883,10 +855,6 @@ public class FourSepulchersManager extends GrandBossManager
rset1.close(); rset1.close();
statement1.close(); statement1.close();
if (Config.DEBUG)
{
LOGGER.info("FourSepulchersManager: loaded " + loaded + " Emperor's grave NPC spawns.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -240,10 +240,6 @@ public class ItemsOnGroundManager
if (_items.isEmpty()) if (_items.isEmpty())
{ {
if (Config.DEBUG)
{
LOGGER.warning("ItemsOnGroundManager: nothing to save...");
}
return; return;
} }
@@ -291,10 +287,6 @@ public class ItemsOnGroundManager
e.printStackTrace(); e.printStackTrace();
} }
} }
if (Config.DEBUG)
{
LOGGER.warning("ItemsOnGroundManager: " + _items.size() + " items on ground saved");
}
} }
} }
@@ -300,12 +300,6 @@ public class CursedWeapon
_player.addSkill(skill, false); _player.addSkill(skill, false);
skill = SkillTable.getInstance().getInfo(3631, 1); skill = SkillTable.getInstance().getInfo(3631, 1);
_player.addSkill(skill, false); _player.addSkill(skill, false);
if (Config.DEBUG)
{
LOGGER.info("Player " + _player.getName() + " has been awarded with skill " + skill);
}
_player.sendSkillList(); _player.sendSkillList();
} }
@@ -450,11 +444,6 @@ public class CursedWeapon
public void saveData() public void saveData()
{ {
if (Config.DEBUG)
{
LOGGER.info("CursedWeapon: Saving data to disk.");
}
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection())
{ {
// Delete previous datas // Delete previous datas
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.datatables.SkillTable; import com.l2jmobius.gameserver.datatables.SkillTable;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.skills.effects.EffectForce; import com.l2jmobius.gameserver.skills.effects.EffectForce;
@@ -77,11 +76,6 @@ public final class ForceBuff
L2Effect effect = _target.getFirstEffect(_forceId); L2Effect effect = _target.getFirstEffect(_forceId);
if (effect != null) if (effect != null)
{ {
if (Config.DEVELOPER)
{
LOGGER.info(" -- Removing ForceBuff " + effect.getSkill().getId());
}
if (effect instanceof EffectForce) if (effect instanceof EffectForce)
{ {
((EffectForce) effect).decreaseForce(); ((EffectForce) effect).decreaseForce();
@@ -1163,13 +1163,7 @@ public abstract class Inventory extends ItemContainer
*/ */
private void unEquipItemInBodySlot(int slot) private void unEquipItemInBodySlot(int slot)
{ {
if (Config.DEBUG)
{
LOGGER.info("--- unequip body slot:" + slot);
}
int pdollSlot = -1; int pdollSlot = -1;
switch (slot) switch (slot)
{ {
case L2Item.SLOT_L_EAR: case L2Item.SLOT_L_EAR:
@@ -708,11 +708,6 @@ public class L2Clan
statement.setInt(9, _clanId); statement.setInt(9, _clanId);
statement.execute(); statement.execute();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("New clan leader saved in db: " + _clanId);
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -737,11 +732,6 @@ public class L2Clan
statement.setInt(10, _allyCrestId); statement.setInt(10, _allyCrestId);
statement.execute(); statement.execute();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("New clan saved in db: " + _clanId);
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -761,11 +751,6 @@ public class L2Clan
statement.execute(); statement.execute();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("clan member removed in db: " + _clanId);
}
statement = con.prepareStatement("UPDATE characters SET apprentice=0 WHERE apprentice=?"); statement = con.prepareStatement("UPDATE characters SET apprentice=0 WHERE apprentice=?");
statement.setInt(1, member.getObjectId()); statement.setInt(1, member.getObjectId());
statement.execute(); statement.execute();
@@ -860,11 +845,6 @@ public class L2Clan
clanData.close(); clanData.close();
statement.close(); statement.close();
if (Config.DEBUG && (_name != null))
{
LOGGER.info("Restored clan data for \"" + _name + "\" from database.");
}
restoreSubPledges(); restoreSubPledges();
restoreRankPrivs(); restoreRankPrivs();
restoreSkills(); restoreSkills();
@@ -1562,11 +1542,6 @@ public class L2Clan
{ {
setReputationScore(_reputationScore - 2500, true); setReputationScore(_reputationScore - 2500, true);
} }
if (Config.DEBUG)
{
LOGGER.info("New sub_clan saved in db: " + _clanId + "; " + pledgeType);
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -1634,11 +1609,6 @@ public class L2Clan
statement.execute(); statement.execute();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("New subpledge leader saved in db: " + _clanId);
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -2119,11 +2089,6 @@ public class L2Clan
return; return;
} }
if (Config.DEBUG)
{
LOGGER.info(player.getObjectId() + "(" + player.getName() + ") requested ally creation from ");
}
if (!player.isClanLeader()) if (!player.isClanLeader())
{ {
player.sendPacket(SystemMessageId.ONLY_CLAN_LEADER_CREATE_ALLIANCE); player.sendPacket(SystemMessageId.ONLY_CLAN_LEADER_CREATE_ALLIANCE);
@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -87,11 +86,6 @@ public class L2Potion extends L2Object
} }
_potionhpRegTask = null; _potionhpRegTask = null;
if (Config.DEBUG)
{
LOGGER.info("Potion HP regen stop");
}
} }
public void setCurrentHpPotion2() public void setCurrentHpPotion2()
@@ -183,11 +177,6 @@ public class L2Potion extends L2Object
private void startPotionMpRegeneration(L2Character activeChar) private void startPotionMpRegeneration(L2Character activeChar)
{ {
_potionmpRegTask = ThreadPool.scheduleAtFixedRate(new PotionMpHealing(activeChar), 1000, _milliseconds); _potionmpRegTask = ThreadPool.scheduleAtFixedRate(new PotionMpHealing(activeChar), 1000, _milliseconds);
if (Config.DEBUG)
{
LOGGER.info("Potion MP regen Started");
}
} }
public void stopPotionMpRegeneration() public void stopPotionMpRegeneration()
@@ -198,11 +187,6 @@ public class L2Potion extends L2Object
} }
_potionmpRegTask = null; _potionmpRegTask = null;
if (Config.DEBUG)
{
LOGGER.info("Potion MP regen stop");
}
} }
public void setCurrentMpPotion2() public void setCurrentMpPotion2()
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Point3D; import com.l2jmobius.commons.util.Point3D;
import com.l2jmobius.commons.util.object.L2ObjectMap; import com.l2jmobius.commons.util.object.L2ObjectMap;
import com.l2jmobius.commons.util.object.L2ObjectSet; import com.l2jmobius.commons.util.object.L2ObjectSet;
@@ -119,14 +118,8 @@ public final class L2World
{ {
if (_allObjects.get(object.getObjectId()) != null) if (_allObjects.get(object.getObjectId()) != null)
{ {
if (Config.DEBUG)
{
LOGGER.warning("[L2World] objectId " + object.getObjectId() + " already exist in OID map!");
}
return; return;
} }
_allObjects.put(object); _allObjects.put(object);
} }
@@ -414,10 +407,6 @@ public final class L2World
// Get all visible objects contained in the _visibleObjects of L2WorldRegions // Get all visible objects contained in the _visibleObjects of L2WorldRegions
// in a circular area of 2000 units // in a circular area of 2000 units
final List<L2Object> visibles = getVisibleObjects(object, 2000); final List<L2Object> visibles = getVisibleObjects(object, 2000);
if (Config.DEBUG)
{
LOGGER.info("objects in range:" + visibles.size());
}
// tell the player about the surroundings // tell the player about the surroundings
// Go through the visible objects contained in the circular area // 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 // Get all visible objects contained in the _visibleObjects of L2WorldRegions in a circular area of 2000 units
List<L2Object> visibles = getVisibleObjects(object, 2000); List<L2Object> visibles = getVisibleObjects(object, 2000);
if (Config.DEBUG)
{
LOGGER.info("objects in range:" + visibles.size());
}
// tell the player about the surroundings // tell the player about the surroundings
// Go through the visible objects contained in the circular area // Go through the visible objects contained in the circular area
@@ -503,10 +488,6 @@ public final class L2World
{ {
if ((cha != null) && !cha.isTeleporting()) if ((cha != null) && !cha.isTeleporting())
{ {
if (Config.DEBUG)
{
LOGGER.info("Removed player: " + cha.getName().toLowerCase());
}
_allPlayers.remove(cha.getName().toLowerCase()); _allPlayers.remove(cha.getName().toLowerCase());
} }
} }
@@ -184,15 +184,12 @@ public final class L2WorldRegion
private void switchAI(Boolean isOn) private void switchAI(Boolean isOn)
{ {
int c = 0;
if (!isOn) if (!isOn)
{ {
for (L2Object o : _visibleObjects) for (L2Object o : _visibleObjects)
{ {
if (o instanceof L2Attackable) if (o instanceof L2Attackable)
{ {
c++;
final L2Attackable mob = (L2Attackable) o; final L2Attackable mob = (L2Attackable) o;
// Set target to null and cancel Attack or Cast // 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 else
{ {
@@ -238,7 +231,6 @@ public final class L2WorldRegion
{ {
if (o instanceof L2Attackable) if (o instanceof L2Attackable)
{ {
c++;
// Start HP/MP/CP Regeneration task // Start HP/MP/CP Regeneration task
((L2Attackable) o).getStatus().startHpMpRegeneration(); ((L2Attackable) o).getStatus().startHpMpRegeneration();
} }
@@ -249,10 +241,6 @@ public final class L2WorldRegion
((L2NpcInstance) o).startRandomAnimationTask(); ((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. // turn the AI on or off to match the region's activation.
switchAI(value); 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()); LOGGER.info("Removed NPC " + target.getObjectId());
} }
} }
if (Config.DEBUG)
{
LOGGER.info("All visible NPCs deleted in Region: " + getName());
}
} }
/** /**
@@ -1095,19 +1095,11 @@ public class TradeList
{ {
if (_locked) if (_locked)
{ {
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] Locked, return false");
}
return false; return false;
} }
if ((items == null) || (items.length == 0)) if ((items == null) || (items.length == 0))
{ {
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] items==null || items.length == 0, return false");
}
return false; return false;
} }
@@ -1126,10 +1118,6 @@ public class TradeList
L2ItemInstance oldItem = player.checkItemManipulation(item.getObjectId(), item.getCount(), "sell"); L2ItemInstance oldItem = player.checkItemManipulation(item.getObjectId(), item.getCount(), "sell");
if (oldItem == null) if (oldItem == null)
{ {
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] player.checkItemManipulation(item.getObjectId(), item.getCount(), 'sell') null, return false");
}
return false; return false;
} }
@@ -1140,10 +1128,6 @@ public class TradeList
{ {
if (ti.getPrice() != item.getPrice()) if (ti.getPrice() != item.getPrice())
{ {
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] ti.getPrice() != item.getPrice(), return false");
}
return false; return false;
} }
@@ -1206,10 +1190,6 @@ public class TradeList
L2ItemInstance oldItem = player.checkItemManipulation(item.getObjectId(), item.getCount(), "sell"); L2ItemInstance oldItem = player.checkItemManipulation(item.getObjectId(), item.getCount(), "sell");
if (oldItem == null) if (oldItem == null)
{ {
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] oldItem == null, return false");
}
return false; return false;
} }
@@ -1224,11 +1204,6 @@ public class TradeList
L2ItemInstance newItem = playerInventory.transferItem("PrivateStore", item.getObjectId(), item.getCount(), ownerInventory, player, _owner); L2ItemInstance newItem = playerInventory.transferItem("PrivateStore", item.getObjectId(), item.getCount(), ownerInventory, player, _owner);
if (newItem == null) if (newItem == null)
{ {
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] newItem == null, return false");
}
return false; return false;
} }
@@ -1288,11 +1263,6 @@ public class TradeList
if (price > ownerInventory.getInventoryItemCount(Config.SELL_ITEM, -1)) if (price > ownerInventory.getInventoryItemCount(Config.SELL_ITEM, -1))
{ {
lock(); lock();
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] price > ownerInventory.getInventoryItemCount(Config.SELL_ITEM, -1), return false");
}
return false; return false;
} }
@@ -1300,11 +1270,6 @@ public class TradeList
if (item == null) if (item == null)
{ {
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] item==null, return false");
}
lock(); lock();
return false; return false;
} }
@@ -1314,11 +1279,6 @@ public class TradeList
if (oldItem == null) if (oldItem == null)
{ {
lock(); lock();
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] _owner.checkItemManipulation(item.getObjectId(), price, 'sell')==null, return false");
}
return false; return false;
} }
@@ -1326,11 +1286,6 @@ public class TradeList
final L2ItemInstance newItem = ownerInventory.transferItem("PrivateStore", item.getObjectId(), price, playerInventory, _owner, player); final L2ItemInstance newItem = ownerInventory.transferItem("PrivateStore", item.getObjectId(), price, playerInventory, _owner, player);
if (newItem == null) if (newItem == null)
{ {
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] newItem = ownerInventory.transferItem('PrivateStore', item.getObjectId(), price, playerInventory,_owner, player) == null, return false");
}
return false; return false;
} }
@@ -1365,11 +1320,6 @@ public class TradeList
// Transfer adena // Transfer adena
if (price > ownerInventory.getAdena()) if (price > ownerInventory.getAdena())
{ {
if (Config.DEBUG)
{
LOGGER.info("[PrivateStoreSell] price > ownerInventory.getAdena(), return false");
}
return false; return false;
} }
@@ -1496,10 +1496,6 @@ public class L2Attackable extends L2NpcInstance
{ {
return new RewardItem(drop.getItemId(), itemCount); return new RewardItem(drop.getItemId(), itemCount);
} }
else if ((itemCount == 0) && Config.DEBUG)
{
LOGGER.info("Roll produced 0 items to drop...");
}
return null; return null;
} }
@@ -1799,10 +1795,6 @@ public class L2Attackable extends L2NpcInstance
{ {
return new RewardItem(drop.getItemId(), itemCount); return new RewardItem(drop.getItemId(), itemCount);
} }
else if ((itemCount == 0) && Config.DEBUG)
{
LOGGER.info("Roll produced 0 items to drop...");
}
} }
return null; return null;
} }
@@ -1912,11 +1904,6 @@ public class L2Attackable extends L2NpcInstance
continue; continue;
} }
if (Config.DEBUG)
{
LOGGER.info("Item id to spoil: " + item.getItemId() + " amount: " + item.getCount());
}
sweepList.add(item); sweepList.add(item);
} }
@@ -1947,11 +1934,6 @@ public class L2Attackable extends L2NpcInstance
if (item != null) if (item != null)
{ {
if (Config.DEBUG)
{
LOGGER.info("Item id to drop: " + item.getItemId() + " amount: " + item.getCount());
}
// Check if the autoLoot mode is active // Check if the autoLoot mode is active
if (Config.AUTO_LOOT) if (Config.AUTO_LOOT)
{ {
@@ -589,11 +589,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
return; 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 // Create the Server->Client packet StatusUpdate with current HP and MP
StatusUpdate su = null; StatusUpdate su = null;
if (Config.FORCE_COMPLETE_STATUS_UPDATE && (this instanceof L2PcInstance)) if (Config.FORCE_COMPLETE_STATUS_UPDATE && (this instanceof L2PcInstance))
@@ -718,11 +713,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
z += 5; 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 // 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)); broadcastPacket(new TeleportToLocation(this, x, y, z));
@@ -843,11 +833,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
*/ */
protected void doAttack(L2Character target) protected void doAttack(L2Character target)
{ {
if (Config.DEBUG)
{
LOGGER.info(getName() + " doAttack: target=" + target);
}
if (target == null) if (target == null)
{ {
return; 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 skill came with another one, we should delete the other one too.
if (oldSkill.triggerAnotherSkill()) if (oldSkill.triggerAnotherSkill())
{ {
if (Config.DEBUG)
{
LOGGER.info("Removing Triggherable Skill: " + oldSkill.getTriggeredId());
}
_triggeredSkills.remove(oldSkill.getTriggeredId()); _triggeredSkills.remove(oldSkill.getTriggeredId());
removeSkill(oldSkill.getTriggeredId(), true); removeSkill(oldSkill.getTriggeredId(), true);
} }
@@ -7367,10 +7347,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
if (newSkill.triggerAnotherSkill()) if (newSkill.triggerAnotherSkill())
{ {
if (Config.DEBUG)
{
LOGGER.info("Adding Triggherable Skill: " + newSkill.getTriggeredId());
}
_triggeredSkills.put(newSkill.getTriggeredId(), SkillTable.getInstance().getInfo(newSkill.getTriggeredId(), newSkill.getTriggeredLevel())); _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... // this is just a fail-safe againts buggers and gm dummies...
if (oldSkill.triggerAnotherSkill()) if (oldSkill.triggerAnotherSkill())
{ {
if (Config.DEBUG)
{
LOGGER.info("Removing Triggherable Skill: " + oldSkill.getTriggeredId());
}
removeSkill(oldSkill.getTriggeredId(), true); removeSkill(oldSkill.getTriggeredId(), true);
_triggeredSkills.remove(oldSkill.getTriggeredId()); _triggeredSkills.remove(oldSkill.getTriggeredId());
} }
@@ -8451,11 +8423,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
*/ */
public void disableAllSkills() public void disableAllSkills()
{ {
if (Config.DEBUG)
{
LOGGER.info("All skills disabled");
}
_allSkillsDisabled = true; _allSkillsDisabled = true;
} }
@@ -8465,11 +8432,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
*/ */
public void enableAllSkills() public void enableAllSkills()
{ {
if (Config.DEBUG)
{
LOGGER.info("All skills enabled");
}
_allSkillsDisabled = false; _allSkillsDisabled = false;
} }
@@ -8933,11 +8895,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
if (Math.abs(angleDiff) <= maxAngleDiff) if (Math.abs(angleDiff) <= maxAngleDiff)
{ {
if (Config.DEBUG)
{
LOGGER.info("Char " + getName() + " is behind " + target.getName());
}
return true; return true;
} }
} }
@@ -9034,11 +8991,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
return false; return false;
} }
if (Config.DEBUG)
{
LOGGER.info("Char " + getName() + " is side " + target.getName());
}
return true; return true;
} }
} }
@@ -199,11 +199,6 @@ public abstract class L2Summon extends L2Playable
} }
else if (player.getTarget() != this) else if (player.getTarget() != this)
{ {
if (Config.DEBUG)
{
LOGGER.info("New target selected:" + getObjectId());
}
player.setTarget(this); player.setTarget(this);
MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()); MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my); player.sendPacket(my);
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.datatables.csv.MapRegionTable; import com.l2jmobius.gameserver.datatables.csv.MapRegionTable;
import com.l2jmobius.gameserver.instancemanager.AuctionManager; import com.l2jmobius.gameserver.instancemanager.AuctionManager;
@@ -184,21 +183,11 @@ public final class L2AuctioneerInstance extends L2FolkInstance
{ {
return; return;
} }
if (Config.DEBUG)
{
player.sendMessage("bidding show successful");
}
try try
{ {
SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm"); SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
final int auctionId = Integer.parseInt(val); final int auctionId = Integer.parseInt(val);
if (Config.DEBUG)
{
player.sendMessage("auction test started");
}
String filename = "data/html/auction/AgitAuctionInfo.htm"; String filename = "data/html/auction/AgitAuctionInfo.htm";
Auction a = AuctionManager.getInstance().getAuction(auctionId); Auction a = AuctionManager.getInstance().getAuction(auctionId);
@@ -334,11 +323,6 @@ public final class L2AuctioneerInstance extends L2FolkInstance
limit *= Integer.parseInt(val); limit *= Integer.parseInt(val);
} }
if (Config.DEBUG)
{
player.sendMessage("cmd list: auction test started");
}
String items = ""; String items = "";
items += "<table width=280 border=0><tr>"; items += "<table width=280 border=0><tr>";
for (int j = 1; j <= npage; j++) for (int j = 1; j <= npage; j++)
@@ -392,11 +376,6 @@ public final class L2AuctioneerInstance extends L2FolkInstance
auctionId = Integer.parseInt(val); auctionId = Integer.parseInt(val);
} }
if (Config.DEBUG)
{
player.sendMessage("cmd bidlist: auction test started");
}
String biders = ""; String biders = "";
Map<Integer, Bidder> bidders = AuctionManager.getInstance().getAuction(auctionId).getBidders(); Map<Integer, Bidder> bidders = AuctionManager.getInstance().getAuction(auctionId).getBidders();
@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.TradeController; import com.l2jmobius.gameserver.TradeController;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.datatables.sql.ClanTable; import com.l2jmobius.gameserver.datatables.sql.ClanTable;
@@ -276,10 +275,6 @@ public class L2CastleChamberlainInstance extends L2FolkInstance
player.tempInvetoryDisable(); player.tempInvetoryDisable();
if (Config.DEBUG)
{
LOGGER.info("Showing chamberlain buylist");
}
int buy; int buy;
{ {
final int castleId = getCastle().getCastleId(); final int castleId = getCastle().getCastleId();
@@ -256,10 +256,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
if (st.countTokens() >= 1) if (st.countTokens() >= 1)
{ {
int fee; int fee;
if (Config.DEBUG)
{
LOGGER.warning("Hp editing invoked");
}
val = st.nextToken(); val = st.nextToken();
final int percent = Integer.valueOf(val); final int percent = Integer.valueOf(val);
switch (percent) switch (percent)
@@ -350,10 +346,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
if (st.countTokens() >= 1) if (st.countTokens() >= 1)
{ {
int fee; int fee;
if (Config.DEBUG)
{
LOGGER.warning("Mp editing invoked");
}
val = st.nextToken(); val = st.nextToken();
final int percent = Integer.valueOf(val); final int percent = Integer.valueOf(val);
switch (percent) switch (percent)
@@ -404,10 +396,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
if (st.countTokens() >= 1) if (st.countTokens() >= 1)
{ {
int fee; int fee;
if (Config.DEBUG)
{
LOGGER.warning("Exp editing invoked");
}
val = st.nextToken(); val = st.nextToken();
final int percent = Integer.valueOf(val); final int percent = Integer.valueOf(val);
switch (percent) switch (percent)
@@ -529,10 +517,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
player.sendMessage("This clan Hall have no owner, you cannot change configuration"); player.sendMessage("This clan Hall have no owner, you cannot change configuration");
return; return;
} }
if (Config.DEBUG)
{
LOGGER.warning("Item editing invoked");
}
val = st.nextToken(); val = st.nextToken();
int fee; int fee;
final int lvl = Integer.valueOf(val); final int lvl = Integer.valueOf(val);
@@ -574,10 +558,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
if (st.countTokens() >= 1) if (st.countTokens() >= 1)
{ {
int fee; int fee;
if (Config.DEBUG)
{
LOGGER.warning("Tele editing invoked");
}
val = st.nextToken(); val = st.nextToken();
final int lvl = Integer.valueOf(val); final int lvl = Integer.valueOf(val);
switch (lvl) switch (lvl)
@@ -613,10 +593,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
if (st.countTokens() >= 1) if (st.countTokens() >= 1)
{ {
int fee; int fee;
if (Config.DEBUG)
{
LOGGER.warning("Support editing invoked");
}
val = st.nextToken(); val = st.nextToken();
final int lvl = Integer.valueOf(val); final int lvl = Integer.valueOf(val);
switch (lvl) switch (lvl)
@@ -739,10 +715,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
if (st.countTokens() >= 1) if (st.countTokens() >= 1)
{ {
int fee; int fee;
if (Config.DEBUG)
{
LOGGER.warning("Deco curtains editing invoked");
}
val = st.nextToken(); val = st.nextToken();
final int lvl = Integer.valueOf(val); final int lvl = Integer.valueOf(val);
switch (lvl) switch (lvl)
@@ -778,10 +750,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
if (st.countTokens() >= 1) if (st.countTokens() >= 1)
{ {
int fee; int fee;
if (Config.DEBUG)
{
LOGGER.warning("Deco curtains editing invoked");
}
val = st.nextToken(); val = st.nextToken();
final int lvl = Integer.valueOf(val); final int lvl = Integer.valueOf(val);
switch (lvl) switch (lvl)
@@ -1083,10 +1051,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
*/ */
private void doTeleport(L2PcInstance player, int val) 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); L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val);
if (list != null) if (list != null)
{ {
@@ -1098,10 +1062,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
} }
else if (player.reduceAdena("Teleport", list.getPrice(), this, true)) 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()); player.teleToLocation(list.getX(), list.getY(), list.getZ());
} }
} }
@@ -1128,11 +1088,6 @@ public class L2ClanHallManagerInstance extends L2FolkInstance
player.tempInvetoryDisable(); player.tempInvetoryDisable();
if (Config.DEBUG)
{
LOGGER.info("Showing buylist :" + player.getName() + " List ID :" + val);
}
L2TradeList list = TradeController.getInstance().getBuyList(val); L2TradeList list = TradeController.getInstance().getBuyList(val);
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
@@ -58,11 +58,6 @@ public final class L2ClassMasterInstance extends L2FolkInstance
@Override @Override
public void onAction(L2PcInstance player) public void onAction(L2PcInstance player)
{ {
if (Config.DEBUG)
{
LOGGER.info("Class master activated!");
}
player.setLastFolkNPC(this); player.setLastFolkNPC(this);
// Check if the L2PcInstance already target the L2NpcInstance // 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) private void changeClass(L2PcInstance player, int val)
{ {
if (Config.DEBUG)
{
LOGGER.info("Changing class to ClassId:" + val);
}
player.setClassId(val); player.setClassId(val);
if (player.isSubClassActive()) if (player.isSubClassActive())
@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.instance; package com.l2jmobius.gameserver.model.actor.instance;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -99,11 +98,6 @@ public class L2CommanderInstance extends L2Attackable
_homeX = getX(); _homeX = getX();
_homeY = getY(); _homeY = getY();
_homeZ = getZ(); _homeZ = getZ();
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ": Home location set to X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ);
}
} }
public int getHomeX() public int getHomeX()
@@ -123,10 +117,6 @@ public class L2CommanderInstance extends L2Attackable
{ {
if (!isInsideRadius(_homeX, _homeY, 40, false)) if (!isInsideRadius(_homeX, _homeY, 40, false))
{ {
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ": moving home");
}
setisReturningToSpawnPoint(true); setisReturningToSpawnPoint(true);
clearAggroList(); clearAggroList();
@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.instance; package com.l2jmobius.gameserver.model.actor.instance;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2CharacterAI;
import com.l2jmobius.gameserver.ai.L2ControllableMobAI; import com.l2jmobius.gameserver.ai.L2ControllableMobAI;
@@ -115,11 +114,6 @@ public class L2ControllableMobInstance extends L2MonsterInstance
if (isDead()) if (isDead())
{ {
// first die (and calculate rewards), if currentHp < 0, then overhit may be calculated // first die (and calculate rewards), if currentHp < 0, then overhit may be calculated
if (Config.DEBUG)
{
LOGGER.info("char is dead.");
}
stopMove(null); stopMove(null);
// Start the doDie process // Start the doDie process
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlEvent;
@@ -665,12 +664,6 @@ public class L2CubicInstance
if ((target != null) && (!target.isDead())) 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)); owner.broadcastPacket(new MagicSkillUse(owner, target, skill.getId(), skill.getLevel(), 0, 0));
final SkillType type = skill.getSkillType(); 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 ((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); useCubicDisabler(type, L2CubicInstance.this, skill, targets);
} }
else if (type == SkillType.MDAM) else if (type == SkillType.MDAM)
{ {
if (Config.DEBUG)
{
LOGGER.info("L2CubicInstance: Action.run() handler " + type);
}
useCubicMdam(L2CubicInstance.this, skill, targets); useCubicMdam(L2CubicInstance.this, skill, targets);
} }
else if ((type == SkillType.POISON) || (type == SkillType.DEBUFF) || (type == SkillType.DOT)) 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); useCubicContinuous(L2CubicInstance.this, skill, targets);
} }
else if (type == SkillType.DRAIN) else if (type == SkillType.DRAIN)
{ {
if (Config.DEBUG)
{
LOGGER.info("L2CubicInstance: Action.run() skill " + type);
}
((L2SkillDrain) skill).useCubicSkill(L2CubicInstance.this, targets); ((L2SkillDrain) skill).useCubicSkill(L2CubicInstance.this, targets);
} }
else else
{ {
handler.useSkill(owner, skill, targets); 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 boolean mcrit = Formulas.calcMCrit(activeCubic.getMCriticalHit(target, skill));
final int damage = (int) Formulas.calcMagicDam(activeCubic, target, skill, mcrit); final int damage = (int) Formulas.calcMagicDam(activeCubic, target, skill, mcrit);
if (Config.DEBUG)
{
LOGGER.info("L2SkillMdam: useCubicSkill() -> damage = " + damage);
}
if (damage > 0) if (damage > 0)
{ {
// Manage attack or cast break of the target (calculating rate, sending message...) // 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) public void useCubicDisabler(SkillType type, L2CubicInstance activeCubic, L2Skill skill, L2Object[] targets)
{ {
if (Config.DEBUG)
{
LOGGER.info("Disablers: useCubicSkill()");
}
for (L2Character target : (L2Character[]) targets) for (L2Character target : (L2Character[]) targets)
{ {
if ((target == null) || target.isDead()) if ((target == null) || target.isDead())
@@ -883,14 +845,6 @@ public class L2CubicInstance
{ {
skill.getEffects(activeCubic.getOwner(), target); skill.getEffects(activeCubic.getOwner(), target);
} }
if (Config.DEBUG)
{
LOGGER.info("Disablers: useCubicSkill() -> success");
}
}
else if (Config.DEBUG)
{
LOGGER.info("Disablers: useCubicSkill() -> failed");
} }
break; break;
} }
@@ -914,14 +868,6 @@ public class L2CubicInstance
{ {
skill.getEffects(activeCubic.getOwner(), target); skill.getEffects(activeCubic.getOwner(), target);
} }
if (Config.DEBUG)
{
LOGGER.info("Disablers: useCubicSkill() -> success");
}
}
else if (Config.DEBUG)
{
LOGGER.info("Disablers: useCubicSkill() -> failed");
} }
break; break;
} }
@@ -971,14 +917,6 @@ public class L2CubicInstance
{ {
skill.getEffects(activeCubic.getOwner(), target); skill.getEffects(activeCubic.getOwner(), target);
} }
if (Config.DEBUG)
{
LOGGER.info("Disablers: useCubicSkill() -> success");
}
}
else if (Config.DEBUG)
{
LOGGER.info("Disablers: useCubicSkill() -> failed");
} }
break; break;
} }
@@ -991,14 +929,6 @@ public class L2CubicInstance
target.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, activeCubic.getOwner(), (int) ((150 * skill.getPower()) / (target.getLevel() + 7))); target.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, activeCubic.getOwner(), (int) ((150 * skill.getPower()) / (target.getLevel() + 7)));
} }
skill.getEffects(activeCubic.getOwner(), target); skill.getEffects(activeCubic.getOwner(), target);
if (Config.DEBUG)
{
LOGGER.info("Disablers: useCubicSkill() -> success");
}
}
else if (Config.DEBUG)
{
LOGGER.info("Disablers: useCubicSkill() -> failed");
} }
break; break;
} }
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2CharacterAI;
@@ -169,23 +168,14 @@ public class L2DoorInstance extends L2Character
{ {
try try
{ {
String doorAction;
if (!_open) if (!_open)
{ {
doorAction = "opened";
openMe(); openMe();
} }
else else
{ {
doorAction = "closed";
closeMe(); closeMe();
} }
if (Config.DEBUG)
{
LOGGER.info("Auto " + doorAction + " door ID " + _doorId + " (" + _name + ") for " + (_autoActionDelay / 60000) + " minute(s).");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -539,28 +529,6 @@ public class L2DoorInstance extends L2Character
return; 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 // Check if the L2PcInstance already target the L2NpcInstance
if (this != player.getTarget()) if (this != player.getTarget())
{ {
@@ -617,28 +585,6 @@ public class L2DoorInstance extends L2Character
return; 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()) if (player.getAccessLevel().isGm())
{ {
player.setTarget(this); player.setTarget(this);
@@ -67,10 +67,6 @@ public class L2FishermanInstance extends L2FolkInstance
taxRate = getCastle().getTaxRate(); taxRate = getCastle().getTaxRate();
} }
player.tempInvetoryDisable(); player.tempInvetoryDisable();
if (Config.DEBUG)
{
LOGGER.info("Showing buylist");
}
L2TradeList list = TradeController.getInstance().getBuyList(val); L2TradeList list = TradeController.getInstance().getBuyList(val);
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
@@ -89,18 +85,7 @@ public class L2FishermanInstance extends L2FolkInstance
private void showSellWindow(L2PcInstance player) private void showSellWindow(L2PcInstance player)
{ {
if (Config.DEBUG)
{
LOGGER.info("Showing selllist");
}
player.sendPacket(new SellList(player)); player.sendPacket(new SellList(player));
if (Config.DEBUG)
{
LOGGER.info("Showing sell window");
}
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
} }
@@ -63,11 +63,6 @@ public class L2FolkInstance extends L2NpcInstance
*/ */
public void showSkillList(L2PcInstance player, ClassId classId) public void showSkillList(L2PcInstance player, ClassId classId)
{ {
if (Config.DEBUG)
{
LOGGER.info("SkillList activated on: " + getObjectId());
}
final int npcId = getTemplate().npcId; final int npcId = getTemplate().npcId;
if (_classesToTeach == null) if (_classesToTeach == null)
@@ -150,11 +145,6 @@ public class L2FolkInstance extends L2NpcInstance
*/ */
public void showEnchantSkillList(L2PcInstance player, ClassId classId) public void showEnchantSkillList(L2PcInstance player, ClassId classId)
{ {
if (Config.DEBUG)
{
LOGGER.info("EnchantSkillList activated on: " + getObjectId());
}
final int npcId = getTemplate().npcId; final int npcId = getTemplate().npcId;
if (_classesToTeach == null) if (_classesToTeach == null)
@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.instance; package com.l2jmobius.gameserver.model.actor.instance;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2CharacterAI;
import com.l2jmobius.gameserver.ai.L2FortSiegeGuardAI; import com.l2jmobius.gameserver.ai.L2FortSiegeGuardAI;
@@ -112,10 +111,6 @@ public class L2FortSiegeGuardInstance extends L2Attackable
} }
if (!isInsideRadius(getSpawn().getX(), getSpawn().getY(), 40, false)) if (!isInsideRadius(getSpawn().getX(), getSpawn().getY(), 40, false))
{ {
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ": moving home");
}
setisReturningToSpawnPoint(true); setisReturningToSpawnPoint(true);
clearAggroList(); clearAggroList();
@@ -141,11 +136,6 @@ public class L2FortSiegeGuardInstance extends L2Attackable
// Check if the L2PcInstance already target the L2NpcInstance // Check if the L2PcInstance already target the L2NpcInstance
if (this != player.getTarget()) if (this != player.getTarget())
{ {
if (Config.DEBUG)
{
LOGGER.info("new target selected:" + getObjectId());
}
// Set the target of the L2PcInstance player // Set the target of the L2PcInstance player
player.setTarget(this); player.setTarget(this);
@@ -16,9 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.instance; 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.concurrent.ThreadPool;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
@@ -42,8 +39,6 @@ import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate;
*/ */
public final class L2GuardInstance extends L2Attackable public final class L2GuardInstance extends L2Attackable
{ {
private static Logger LOGGER = Logger.getLogger(L2GuardInstance.class.getName());
private static final int RETURN_INTERVAL = 60000; private static final int RETURN_INTERVAL = 60000;
private int _homeX; private int _homeX;
private int _homeY; private int _homeY;
@@ -115,11 +110,6 @@ public final class L2GuardInstance extends L2Attackable
_homeX = getX(); _homeX = getX();
_homeY = getY(); _homeY = getY();
_homeZ = getZ(); _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 (!isInsideRadius(_homeX, _homeY, 150, false))
{ {
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ": moving hometo X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ);
}
clearAggroList(); clearAggroList();
getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_homeX, _homeY, _homeZ, 0)); 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(); _homeY = getY();
_homeZ = getZ(); _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. // check the region where this mob is, do not activate the AI if region is inactive.
L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY()); L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY());
if ((region != null) && !region.isActive()) if ((region != null) && !region.isActive())
@@ -234,11 +213,6 @@ public final class L2GuardInstance extends L2Attackable
// Check if the L2PcInstance already target the L2GuardInstance // Check if the L2PcInstance already target the L2GuardInstance
if (getObjectId() != player.getTargetId()) if (getObjectId() != player.getTargetId())
{ {
if (Config.DEBUG)
{
LOGGER.info(player.getObjectId() + ": Targetted guard " + getObjectId());
}
// Set the target of the L2PcInstance player // Set the target of the L2PcInstance player
player.setTarget(this); 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 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 // Set the L2PcInstance Intention to AI_INTENTION_ATTACK
player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this); player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
} }
@@ -16,9 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.instance; 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.concurrent.ThreadPool;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
@@ -41,8 +38,6 @@ import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate;
*/ */
public final class L2GuardNoHTMLInstance extends L2Attackable public final class L2GuardNoHTMLInstance extends L2Attackable
{ {
private static Logger LOGGER = Logger.getLogger(L2GuardNoHTMLInstance.class.getName());
private static final int RETURN_INTERVAL = 60000; private static final int RETURN_INTERVAL = 60000;
private int _homeX; private int _homeX;
private int _homeY; private int _homeY;
@@ -113,10 +108,6 @@ public final class L2GuardNoHTMLInstance extends L2Attackable
_homeX = getX(); _homeX = getX();
_homeY = getY(); _homeY = getY();
_homeZ = getZ(); _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 (!isInsideRadius(_homeX, _homeY, 150, false))
{ {
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ": moving hometo X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ);
}
clearAggroList(); clearAggroList();
getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_homeX, _homeY, _homeZ, 0)); 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(); _homeX = getX();
_homeY = getY(); _homeY = getY();
_homeZ = getZ(); _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. // check the region where this mob is, do not activate the AI if region is inactive.
final L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY()); final L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY());
if ((region != null) && !region.isActive()) if ((region != null) && !region.isActive())
@@ -196,26 +180,16 @@ public final class L2GuardNoHTMLInstance extends L2Attackable
{ {
// Set the L2PcInstance Intention to AI_INTENTION_IDLE // Set the L2PcInstance Intention to AI_INTENTION_IDLE
player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null); 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 // Set the target of the L2PcInstance player
player.setTarget(this); player.setTarget(this);
// Send a Server->Client packet MyTargetSelected to the L2PcInstance // Send a Server->Client packet MyTargetSelected to the L2PcInstance player The color to display in the select window is White
// player The color to display in the select window is White
final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0); final MyTargetSelected my = new MyTargetSelected(getObjectId(), 0);
player.sendPacket(my); player.sendPacket(my);
// Send a Server->Client packet ValidateLocation to correct the // Send a Server->Client packet ValidateLocation to correct the L2NpcInstance position and heading on the client
// L2NpcInstance position and heading on the client
player.sendPacket(new ValidateLocation(this)); player.sendPacket(new ValidateLocation(this));
} }
else if (containsTarget(player)) // Check if the L2PcInstance is in the _aggroList of the L2GuardInstance 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 // Set the L2PcInstance Intention to AI_INTENTION_ATTACK
player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this); player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
} }
@@ -1306,10 +1306,6 @@ public final class L2ItemInstance extends L2Object
} }
catch (Exception e) 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(); updateInDb();
} }
} }
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.TradeController; import com.l2jmobius.gameserver.TradeController;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2Clan;
@@ -118,10 +117,6 @@ public final class L2MercManagerInstance extends L2FolkInstance
private void showBuyWindow(L2PcInstance player, int val) private void showBuyWindow(L2PcInstance player, int val)
{ {
player.tempInvetoryDisable(); player.tempInvetoryDisable();
if (Config.DEBUG)
{
LOGGER.info("Showing buylist");
}
L2TradeList list = TradeController.getInstance().getBuyList(val); L2TradeList list = TradeController.getInstance().getBuyList(val);
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
@@ -70,12 +70,6 @@ public class L2MerchantInstance extends L2FolkInstance
private void showWearWindow(L2PcInstance player, int val) private void showWearWindow(L2PcInstance player, int val)
{ {
player.tempInvetoryDisable(); player.tempInvetoryDisable();
if (Config.DEBUG)
{
LOGGER.info("Showing wearlist");
}
L2TradeList list = TradeController.getInstance().getBuyList(val); L2TradeList list = TradeController.getInstance().getBuyList(val);
if (list != null) if (list != null)
@@ -106,13 +100,7 @@ public class L2MerchantInstance extends L2FolkInstance
player.tempInvetoryDisable(); player.tempInvetoryDisable();
if (Config.DEBUG)
{
LOGGER.info("Showing buylist");
}
L2TradeList list = TradeController.getInstance().getBuyList(val); L2TradeList list = TradeController.getInstance().getBuyList(val);
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId()))) if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{ {
BuyList bl = new BuyList(list, player.getAdena(), taxRate); BuyList bl = new BuyList(list, player.getAdena(), taxRate);
@@ -133,18 +121,7 @@ public class L2MerchantInstance extends L2FolkInstance
*/ */
private void showSellWindow(L2PcInstance player) private void showSellWindow(L2PcInstance player)
{ {
if (Config.DEBUG)
{
LOGGER.info("Showing selllist");
}
player.sendPacket(new SellList(player)); player.sendPacket(new SellList(player));
if (Config.DEBUG)
{
LOGGER.info("Showing sell window");
}
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
} }
@@ -769,11 +769,6 @@ public class L2NpcInstance extends L2Character
// Check if the L2PcInstance already target the L2NpcInstance // Check if the L2PcInstance already target the L2NpcInstance
if (this != player.getTarget()) if (this != player.getTarget())
{ {
if (Config.DEBUG)
{
LOGGER.info("new target selected:" + getObjectId());
}
// Set the target of the L2PcInstance player // Set the target of the L2PcInstance player
player.setTarget(this); player.setTarget(this);
@@ -2016,18 +2011,6 @@ public class L2NpcInstance extends L2Character
final String stateId = State.getStateName(qs.getState()); final String stateId = State.getStateName(qs.getState());
final String path = Config.DATAPACK_ROOT + "/data/scripts/quests/" + questId + "/" + stateId + ".htm"; final String path = Config.DATAPACK_ROOT + "/data/scripts/quests/" + questId + "/" + stateId + ".htm";
content = HtmCache.getInstance().getHtm(path); 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 // Send a Server->Client packet NpcHtmlMessage to the L2PcInstance in order to display the message of the L2Npc
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
import java.util.Map; import java.util.Map;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2CharacterAI;
import com.l2jmobius.gameserver.ai.L2NpcWalkerAI; import com.l2jmobius.gameserver.ai.L2NpcWalkerAI;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -77,10 +76,6 @@ public class L2NpcWalkerInstance extends L2NpcInstance
if (_knownPlayers == null) if (_knownPlayers == null)
{ {
if (Config.DEVELOPER)
{
LOGGER.info("broadcastChat _players == null");
}
return; return;
} }
@@ -1654,12 +1654,12 @@ public final class L2PcInstance extends L2Playable
continue; continue;
} }
if (qs.isCompleted() && !Config.DEVELOPER) if (qs.isCompleted())
{ {
continue; continue;
} }
if (!qs.isStarted() && !Config.DEVELOPER) if (!qs.isStarted())
{ {
continue; continue;
} }
@@ -1864,11 +1864,6 @@ public final class L2PcInstance extends L2Playable
if (content != null) if (content != null)
{ {
if (Config.DEBUG)
{
LOGGER.info("Showing quest window for quest " + questId + " state " + stateId + " html path: " + path);
}
NpcHtmlMessage npcReply = new NpcHtmlMessage(5); NpcHtmlMessage npcReply = new NpcHtmlMessage(5);
npcReply.setHtml(content); npcReply.setHtml(content);
sendPacket(npcReply); sendPacket(npcReply);
@@ -2922,10 +2917,6 @@ public final class L2PcInstance extends L2Playable
if (!effectSkill.getWeaponDependancy(this)) if (!effectSkill.getWeaponDependancy(this))
{ {
sendMessage(effectSkill.getName() + " cannot be used with this weapon."); 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(); currenteffect.exit();
} }
} }
@@ -2981,10 +2972,6 @@ public final class L2PcInstance extends L2Playable
public void setPvpKills(int pvpKills) public void setPvpKills(int pvpKills)
{ {
_pvpKills = 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); L2Skill skill = SkillTable.getInstance().getInfo(194, 1);
skill = removeSkill(skill); skill = removeSkill(skill);
if (Config.DEBUG && (skill != null))
{
LOGGER.info("Removed skill 'Lucky' from " + getName());
}
} }
// Calculate the current higher Expertise of the L2PcInstance // 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()); L2Skill skill = SkillTable.getInstance().getInfo(239, getExpertiseIndex());
addSkill(skill, !restore); 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 // 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 // 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 (((getPet() != null) && (getPet().getControlItemId() == objectId)) || (getMountObjectID() == objectId))
{ {
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ": player tried to " + action + " item controling pet");
}
return null; return null;
} }
if ((getActiveEnchantItem() != null) && (getActiveEnchantItem().getObjectId() == objectId)) if ((getActiveEnchantItem() != null) && (getActiveEnchantItem().getObjectId() == objectId))
{ {
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ":player tried to " + action + " an enchant scroll he was using");
}
return null; return null;
} }
@@ -4960,11 +4923,6 @@ public final class L2PcInstance extends L2Playable
*/ */
public void setProtection(boolean protect) 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()) if (isInOlympiadMode())
{ {
return; return;
@@ -4984,11 +4942,6 @@ public final class L2PcInstance extends L2Playable
*/ */
public void setTeleportProtection(boolean protect) 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; _teleportProtectEndTime = protect ? GameTimeController.getGameTicks() + (Config.PLAYER_TELEPORT_PROTECTION * GameTimeController.TICKS_PER_SECOND) : 0;
if (protect) 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 // Check if a party is in progress and party window update is usefull
if (isInParty() && (needCpUpdate(352) || super.needHpUpdate(352) || needMpUpdate(352))) 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 // Send the Server->Client packet PartySmallWindowUpdate with current HP, MP and Level to all other L2PcInstance of the Party
PartySmallWindowUpdate update = new PartySmallWindowUpdate(this); PartySmallWindowUpdate update = new PartySmallWindowUpdate(this);
getParty().broadcastToPartyMembers(this, update); getParty().broadcastToPartyMembers(this, update);
@@ -5705,10 +5654,6 @@ public final class L2PcInstance extends L2Playable
{ {
if ((player.getOlympiadGameId() == getOlympiadGameId()) && player.isOlympiadStart()) 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)); 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 // Send a Server->Client packet UserInfo to this L2PcInstance
sendPacket(new UserInfo(this)); 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)); 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 // Send a Server->Client packet UserInfo to this L2PcInstance
sendPacket(new UserInfo(this)); 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)); Broadcast.toKnownPlayers(this, new TitleUpdate(this));
} }
@@ -5996,12 +5927,7 @@ public final class L2PcInstance extends L2Playable
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
// Send a Server->Client packet StopMove to this L2PcInstance // Send a Server->Client packet StopMove to this L2PcInstance
StopMove sm = new StopMove(this); sendPacket(new StopMove(this));
if (Config.DEBUG)
{
LOGGER.info("pickup pos: " + target.getX() + " " + target.getY() + " " + target.getZ());
}
sendPacket(sm);
synchronized (target) synchronized (target)
{ {
@@ -8005,11 +7931,6 @@ public final class L2PcInstance extends L2Playable
setCharmOfCourage(false); setCharmOfCourage(false);
} }
if (Config.DEBUG)
{
LOGGER.info(getName() + " died and lost " + lostExp + " experience.");
}
// Set the new Experience value of the L2PcInstance // Set the new Experience value of the L2PcInstance
getStat().addExp(-lostExp); getStat().addExp(-lostExp);
} }
@@ -8500,22 +8421,10 @@ public final class L2PcInstance extends L2Playable
protected void reduceArrowCount() protected void reduceArrowCount()
{ {
L2ItemInstance arrows = getInventory().destroyItem("Consume", getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LHAND), 1, this, null); 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)) if ((arrows == null) || (arrows.getCount() == 0))
{ {
getInventory().unEquipItemInSlot(Inventory.PAPERDOLL_LHAND); getInventory().unEquipItemInSlot(Inventory.PAPERDOLL_LHAND);
_arrowItem = null; _arrowItem = null;
if (Config.DEBUG)
{
LOGGER.info("removed arrows count");
}
sendPacket(new ItemList(this, false)); sendPacket(new ItemList(this, false));
} }
else if (!Config.FORCE_INVENTORY_UPDATE) else if (!Config.FORCE_INVENTORY_UPDATE)
@@ -10368,12 +10277,6 @@ public final class L2PcInstance extends L2Playable
if (!foundskill) if (!foundskill)
{ {
removeSkill(skill); 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; 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 // Create a new SkillDat object and queue it in the player _queuedSkill
setQueuedSkill(skill, forceUse, dontMove); setQueuedSkill(skill, forceUse, dontMove);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
@@ -11295,19 +11193,6 @@ public final class L2PcInstance extends L2Playable
// triggered skills cannot be used directly // triggered skills cannot be used directly
if (_triggeredSkills.size() > 0) 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) if (_triggeredSkills.get(skill.getId()) != null)
{ {
sendPacket(ActionFailed.STATIC_PACKET); 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) 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); final L2CubicInstance cubic = new L2CubicInstance(this, id, level, (int) matk, activationtime, activationchance, totalLifetime, givenByOther);
synchronized (_cubics) synchronized (_cubics)
{ {
_cubics.put(id, cubic); _cubics.put(id, cubic);
} }
} }
/** /**
@@ -13617,15 +13497,9 @@ public final class L2PcInstance extends L2Playable
if (output) if (output)
{ {
// Commit after database INSERT incase exception is thrown. // Commit after database INSERT incase exception is thrown.
getSubClasses().put(newClass.getClassIndex(), newClass); 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]; ClassId subTemplate = ClassId.values()[classId];
Collection<L2SkillLearn> skillTree = SkillTreeTable.getInstance().getAllowedSkills(subTemplate); Collection<L2SkillLearn> skillTree = SkillTreeTable.getInstance().getAllowedSkills(subTemplate);
@@ -13652,11 +13526,6 @@ public final class L2PcInstance extends L2Playable
storeSkill(newSkill, prevSkill, classIndex); storeSkill(newSkill, prevSkill, classIndex);
} }
} }
if (Config.DEBUG)
{
LOGGER.info(getName() + " was given " + getAllSkills().length + " skills for their new sub class.");
}
} }
return output; return output;
@@ -13672,13 +13541,6 @@ public final class L2PcInstance extends L2Playable
*/ */
public boolean modifySubClass(int classIndex, int newClassId) 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; boolean output = false;
try (Connection con = DatabaseFactory.getConnection()) 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 // 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 (((getPet() != null) && (getPet().getControlItemId() == objectId)) || (getMountObjectID() == objectId))
{ {
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ": player tried to " + action + " item controling pet");
}
return false; return false;
} }
if ((getActiveEnchantItem() != null) && (getActiveEnchantItem().getObjectId() == objectId)) if ((getActiveEnchantItem() != null) && (getActiveEnchantItem().getObjectId() == objectId))
{ {
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ":player tried to " + action + " an enchant scroll he was using");
}
return false; return false;
} }
@@ -16366,20 +16218,9 @@ public final class L2PcInstance extends L2Playable
{ {
if (currentSkill == null) if (currentSkill == null)
{ {
if (Config.DEBUG)
{
LOGGER.info("Setting current skill: NULL for " + getName() + ".");
}
_currentSkill = null; _currentSkill = null;
return; return;
} }
if (Config.DEBUG)
{
LOGGER.info("Setting current skill: " + currentSkill.getName() + " (ID: " + currentSkill.getId() + ") for " + getName() + ".");
}
_currentSkill = new SkillDat(currentSkill, ctrlPressed, shiftPressed); _currentSkill = new SkillDat(currentSkill, ctrlPressed, shiftPressed);
} }
@@ -16403,20 +16244,9 @@ public final class L2PcInstance extends L2Playable
{ {
if (queuedSkill == null) if (queuedSkill == null)
{ {
if (Config.DEBUG)
{
LOGGER.info("Setting queued skill: NULL for " + getName() + ".");
}
_queuedSkill = null; _queuedSkill = null;
return; return;
} }
if (Config.DEBUG)
{
LOGGER.info("Setting queued skill: " + queuedSkill.getName() + " (ID: " + queuedSkill.getId() + ") for " + getName() + ".");
}
_queuedSkill = new SkillDat(queuedSkill, ctrlPressed, shiftPressed); _queuedSkill = new SkillDat(queuedSkill, ctrlPressed, shiftPressed);
} }
@@ -16588,11 +16418,6 @@ public final class L2PcInstance extends L2Playable
*/ */
public void restoreCustomStatus() public void restoreCustomStatus()
{ {
if (Config.DEVELOPER)
{
LOGGER.info("Restoring character status " + getName() + " from database...");
}
int hero = 0; int hero = 0;
int noble = 0; int noble = 0;
int donator = 0; int donator = 0;
@@ -18482,20 +18307,9 @@ public final class L2PcInstance extends L2Playable
{ {
if (currentSkill == null) if (currentSkill == null)
{ {
if (Config.DEBUG)
{
LOGGER.info("Setting current pet skill: NULL for " + getName() + ".");
}
_currentPetSkill = null; _currentPetSkill = null;
return; return;
} }
if (Config.DEBUG)
{
LOGGER.info("Setting current Pet skill: " + currentSkill.getName() + " (ID: " + currentSkill.getId() + ") for " + getName() + ".");
}
_currentPetSkill = new SkillDat(currentSkill, ctrlPressed, shiftPressed); _currentPetSkill = new SkillDat(currentSkill, ctrlPressed, shiftPressed);
} }
} }
@@ -170,10 +170,7 @@ public class L2PetInstance extends L2Summon
} }
catch (Throwable e) 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 else
{ {
if (Config.DEBUG)
{
LOGGER.info("new target selected:" + getObjectId());
}
player.setTarget(this); player.setTarget(this);
MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()); MyTargetSelected my = new MyTargetSelected(getObjectId(), player.getLevel() - getLevel());
player.sendPacket(my); player.sendPacket(my);
@@ -474,14 +466,7 @@ public class L2PetInstance extends L2Summon
protected void doPickupItem(L2Object object) protected void doPickupItem(L2Object object)
{ {
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
StopMove sm = new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading()); broadcastPacket(new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading()));
if (Config.DEBUG)
{
LOGGER.info("Pet pickup pos: " + object.getX() + " " + object.getY() + " " + object.getZ());
}
broadcastPacket(sm);
if (!(object instanceof L2ItemInstance)) if (!(object instanceof L2ItemInstance))
{ {
@@ -964,10 +949,6 @@ public class L2PetInstance extends L2Summon
{ {
_feedTask.cancel(false); _feedTask.cancel(false);
_feedTask = null; _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) public synchronized void startFeed(boolean battleFeed)
{ {
// stop feeding task if its active // stop feeding task if its active
stopFeed(); stopFeed();
if (!isDead()) if (!isDead())
{ {
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
@@ -106,11 +105,6 @@ public class L2SepulcherNpcInstance extends L2NpcInstance
// Check if the L2PcInstance already target the L2NpcInstance // Check if the L2PcInstance already target the L2NpcInstance
if (this != player.getTarget()) if (this != player.getTarget())
{ {
if (Config.DEBUG)
{
LOGGER.info("new target selected:" + getObjectId());
}
// Set the target of the L2PcInstance player // Set the target of the L2PcInstance player
player.setTarget(this); player.setTarget(this);
@@ -16,9 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.instance; 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.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2CharacterAI;
@@ -41,8 +38,6 @@ import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate;
*/ */
public class L2SiegeGuardInstance extends L2Attackable public class L2SiegeGuardInstance extends L2Attackable
{ {
private static Logger LOGGER = Logger.getLogger(L2GuardInstance.class.getName());
private int _homeX; private int _homeX;
private int _homeY; private int _homeY;
private int _homeZ; private int _homeZ;
@@ -103,11 +98,6 @@ public class L2SiegeGuardInstance extends L2Attackable
_homeX = getX(); _homeX = getX();
_homeY = getY(); _homeY = getY();
_homeZ = getZ(); _homeZ = getZ();
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ": Home location set to X:" + _homeX + " Y:" + _homeY + " Z:" + _homeZ);
}
} }
public int getHomeX() public int getHomeX()
@@ -127,10 +117,6 @@ public class L2SiegeGuardInstance extends L2Attackable
{ {
if (!isInsideRadius(_homeX, _homeY, 40, false)) if (!isInsideRadius(_homeX, _homeY, 40, false))
{ {
if (Config.DEBUG)
{
LOGGER.info(getObjectId() + ": moving home");
}
setisReturningToSpawnPoint(true); setisReturningToSpawnPoint(true);
clearAggroList(); clearAggroList();
@@ -155,11 +141,6 @@ public class L2SiegeGuardInstance extends L2Attackable
// Check if the L2PcInstance already target the L2NpcInstance // Check if the L2PcInstance already target the L2NpcInstance
if (this != player.getTarget()) if (this != player.getTarget())
{ {
if (Config.DEBUG)
{
LOGGER.info("new target selected:" + getObjectId());
}
// Set the target of the L2PcInstance player // Set the target of the L2PcInstance player
player.setTarget(this); player.setTarget(this);
@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.L2Skill; 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. // 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. // Otherwise have to destroy items from owner's inventory in order to let summon live.
final int delay = 1000; _summonLifeTask = ThreadPool.scheduleAtFixedRate(new SummonLifetime(getOwner(), this), 1000, 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);
} }
@Override @Override
@@ -213,11 +200,6 @@ public class L2SummonInstance extends L2Summon
return false; return false;
} }
if (Config.DEBUG)
{
LOGGER.warning("L2SummonInstance: " + getTemplate().name + " (" + getOwner().getName() + ") has been killed.");
}
if (_summonLifeTask != null) if (_summonLifeTask != null)
{ {
_summonLifeTask.cancel(true); _summonLifeTask.cancel(true);
@@ -240,11 +222,6 @@ public class L2SummonInstance extends L2Summon
@Override @Override
public void run() public void run()
{ {
if (Config.DEBUG)
{
LOGGER.warning("L2SummonInstance: " + _summon.getTemplate().name + " (" + _activeChar.getName() + ") run task.");
}
try try
{ {
final double oldTimeRemaining = _summon.getTimeRemaining(); final double oldTimeRemaining = _summon.getTimeRemaining();
@@ -287,10 +264,7 @@ public class L2SummonInstance extends L2Summon
} }
catch (Throwable e) 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 @Override
public synchronized void unSummon(L2PcInstance owner) public synchronized void unSummon(L2PcInstance owner)
{ {
if (Config.DEBUG)
{
LOGGER.warning("L2SummonInstance: " + getTemplate().name + " (" + owner.getName() + ") unsummoned.");
}
if (_summonLifeTask != null) if (_summonLifeTask != null)
{ {
_summonLifeTask.cancel(true); _summonLifeTask.cancel(true);
@@ -321,11 +290,6 @@ public class L2SummonInstance extends L2Summon
@Override @Override
public boolean destroyItemByItemId(String process, int itemId, int count, L2Object reference, boolean sendMessage) 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); return getOwner().destroyItemByItemId(process, itemId, count, reference, sendMessage);
} }
@@ -275,28 +275,16 @@ public final class L2TeleporterInstance extends L2FolkInstance
// Lilith and Anakim have BossZone, so players must be allowed to enter // Lilith and Anakim have BossZone, so players must be allowed to enter
else if (list.getTeleId() == 450) 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()); final L2BossZone _zone = GrandBossManager.getInstance().getZone(list.getX(), list.getY(), list.getZ());
_zone.allowPlayerEntry(player, 300); _zone.allowPlayerEntry(player, 300);
player.teleToLocation(list.getX(), list.getY(), list.getZ(), true); 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))) 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); 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))) 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); player.teleToLocation(list.getX(), list.getY(), list.getZ(), true);
} }
} }
@@ -572,11 +572,6 @@ public final class L2VillageMasterInstance extends L2FolkInstance
*/ */
public void dissolveClan(L2PcInstance player, int clanId) 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()) if (!player.isClanLeader())
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); 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) 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()) if (!player.isClanLeader())
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); 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) 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()) if (!player.isClanLeader())
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); 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) 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()) if (!player.isClanLeader())
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); 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) 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()) if (!player.isClanLeader())
{ {
player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); 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) public void showPledgeSkillList(L2PcInstance player)
{ {
if (Config.DEBUG)
{
LOGGER.info("PledgeSkillList activated on: " + getObjectId());
}
if (player.getClan() == null) if (player.getClan() == null)
{ {
return; return;
@@ -71,10 +71,6 @@ public final class L2WarehouseInstance extends L2FolkInstance
return; return;
} }
if (Config.DEBUG)
{
LOGGER.info("Showing stored items");
}
player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE)); player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.PRIVATE));
} }
@@ -87,11 +83,6 @@ public final class L2WarehouseInstance extends L2FolkInstance
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
player.setActiveWarehouse(player.getWarehouse()); player.setActiveWarehouse(player.getWarehouse());
player.tempInvetoryDisable(); player.tempInvetoryDisable();
if (Config.DEBUG)
{
LOGGER.info("Showing items to deposit");
}
player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.PRIVATE)); player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.PRIVATE));
} }
@@ -112,10 +103,6 @@ public final class L2WarehouseInstance extends L2FolkInstance
{ {
player.setActiveWarehouse(player.getClan().getWarehouse()); player.setActiveWarehouse(player.getClan().getWarehouse());
player.tempInvetoryDisable(); player.tempInvetoryDisable();
if (Config.DEBUG)
{
LOGGER.info("Showing items to deposit - clan");
}
WareHouseDepositList dl = new WareHouseDepositList(player, WareHouseDepositList.CLAN); WareHouseDepositList dl = new WareHouseDepositList(player, WareHouseDepositList.CLAN);
player.sendPacket(dl); player.sendPacket(dl);
@@ -143,10 +130,6 @@ public final class L2WarehouseInstance extends L2FolkInstance
else else
{ {
player.setActiveWarehouse(player.getClan().getWarehouse()); player.setActiveWarehouse(player.getClan().getWarehouse());
if (Config.DEBUG)
{
LOGGER.info("Showing items to deposit - clan");
}
player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.CLAN)); player.sendPacket(new WareHouseWithdrawalList(player, WareHouseWithdrawalList.CLAN));
} }
} }
@@ -158,13 +141,8 @@ public final class L2WarehouseInstance extends L2FolkInstance
private void showWithdrawWindowFreight(L2PcInstance player) private void showWithdrawWindowFreight(L2PcInstance player)
{ {
player.sendPacket(ActionFailed.STATIC_PACKET); player.sendPacket(ActionFailed.STATIC_PACKET);
if (Config.DEBUG)
{
LOGGER.info("Showing freightened items");
}
PcFreight freight = player.getFreight(); PcFreight freight = player.getFreight();
if (freight != null) if (freight != null)
{ {
if (freight.getSize() > 0) if (freight.getSize() > 0)
@@ -185,10 +163,6 @@ public final class L2WarehouseInstance extends L2FolkInstance
player.sendPacket(SystemMessageId.NO_ITEM_DEPOSITED_IN_WH); 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)); 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) if (destChar == null)
{ {
// Something went wrong! // Something went wrong!
if (Config.DEBUG)
{
LOGGER.warning("Error retrieving a target object for char " + player.getName() + " - using freight.");
}
return; return;
} }
@@ -253,11 +218,6 @@ public final class L2WarehouseInstance extends L2FolkInstance
player.tempInvetoryDisable(); player.tempInvetoryDisable();
destChar.deleteMe(); destChar.deleteMe();
if (Config.DEBUG)
{
LOGGER.info("Showing items to freight");
}
player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.FREIGHT)); player.sendPacket(new WareHouseDepositList(player, WareHouseDepositList.FREIGHT));
} }
@@ -16,8 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.knownlist; package com.l2jmobius.gameserver.model.actor.knownlist;
import java.util.logging.Logger;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2CharacterAI;
@@ -29,8 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public class GuardKnownList extends AttackableKnownList public class GuardKnownList extends AttackableKnownList
{ {
private static Logger LOGGER = Logger.getLogger(GuardKnownList.class.getName());
public GuardKnownList(L2GuardInstance activeChar) public GuardKnownList(L2GuardInstance activeChar)
{ {
super(activeChar); super(activeChar);
@@ -63,11 +59,6 @@ public class GuardKnownList extends AttackableKnownList
if (player.getKarma() > 0) 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 // Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE
if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)
{ {
@@ -82,11 +73,6 @@ public class GuardKnownList extends AttackableKnownList
if (mob.isAggressive()) 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 // Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE
if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)
{ {
@@ -16,8 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.knownlist; package com.l2jmobius.gameserver.model.actor.knownlist;
import java.util.logging.Logger;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2CharacterAI;
@@ -29,8 +27,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public class GuardNoHTMLKnownList extends AttackableKnownList public class GuardNoHTMLKnownList extends AttackableKnownList
{ {
private static Logger LOGGER = Logger.getLogger(GuardKnownList.class.getName());
public GuardNoHTMLKnownList(L2GuardNoHTMLInstance activeChar) public GuardNoHTMLKnownList(L2GuardNoHTMLInstance activeChar)
{ {
super(activeChar); super(activeChar);
@@ -63,11 +59,6 @@ public class GuardNoHTMLKnownList extends AttackableKnownList
if (player.getKarma() > 0) 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 // Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE
if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)
{ {
@@ -82,11 +73,6 @@ public class GuardNoHTMLKnownList extends AttackableKnownList
if (mob.isAggressive()) 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 // Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE
if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)
{ {
@@ -16,8 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.stat; package com.l2jmobius.gameserver.model.actor.stat;
import java.util.logging.Logger;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.L2Skill; import com.l2jmobius.gameserver.model.L2Skill;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -29,8 +27,6 @@ import com.l2jmobius.gameserver.skills.Stats;
public class CharStat public class CharStat
{ {
private final Logger LOGGER = Logger.getLogger(CharStat.class.getName());
private final L2Character _activeChar; private final L2Character _activeChar;
private long _exp = 0; private long _exp = 0;
private int _sp = 0; private int _sp = 0;
@@ -861,15 +857,7 @@ public class CharStat
{ {
return 1; return 1;
} }
return (int) calcStat(Stats.POWER_ATTACK_RANGE, _activeChar.getTemplate().baseAtkRange, null, null);
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;
} }
/** /**
@@ -208,11 +208,6 @@ public class PcStat extends PlayableStat
if ((getActiveChar().getLevel() >= Config.MAX_LEVEL_NEWBIE_STATUS) && getActiveChar().isNewbie()) if ((getActiveChar().getLevel() >= Config.MAX_LEVEL_NEWBIE_STATUS) && getActiveChar().isNewbie())
{ {
getActiveChar().setNewbie(false); getActiveChar().setNewbie(false);
if (Config.DEBUG)
{
LOGGER.info("Newbie character ended: " + getActiveChar().getCharId());
}
} }
QuestState qs = getActiveChar().getQuestState("255_Tutorial"); QuestState qs = getActiveChar().getQuestState("255_Tutorial");
@@ -21,7 +21,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention; 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 // Start the doDie process
_activeChar.doDie(attacker); _activeChar.doDie(attacker);
@@ -319,11 +312,6 @@ public class CharStatus
{ {
if ((_regTask == null) && !_activeChar.isDead()) if ((_regTask == null) && !_activeChar.isDead())
{ {
if (Config.DEBUG)
{
LOGGER.info("HP/MP/CP regen started");
}
// Get the Regeneration periode // Get the Regeneration periode
final int period = Formulas.getRegeneratePeriod(_activeChar); final int period = Formulas.getRegeneratePeriod(_activeChar);
@@ -345,11 +333,6 @@ public class CharStatus
{ {
if (_regTask != null) if (_regTask != null)
{ {
if (Config.DEBUG)
{
LOGGER.info("HP/MP/CP regen stop");
}
// Stop the HP/MP/CP Regeneration task // Stop the HP/MP/CP Regeneration task
_regTask.cancel(false); _regTask.cancel(false);
_regTask = null; _regTask = null;
@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.status; package com.l2jmobius.gameserver.model.actor.status;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.L2Playable;
import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.L2Summon;
@@ -154,27 +153,13 @@ public class PcStatus extends PlayableStatus
// Send a System Message to the L2PcInstance // Send a System Message to the L2PcInstance
SystemMessage smsg = new SystemMessage(SystemMessageId.S1_GAVE_YOU_S2_DMG); SystemMessage smsg = new SystemMessage(SystemMessageId.S1_GAVE_YOU_S2_DMG);
if (Config.DEBUG)
{
LOGGER.info("Attacker:" + attacker.getName());
}
if (attacker instanceof L2NpcInstance) if (attacker instanceof L2NpcInstance)
{ {
final int mobId = ((L2NpcInstance) attacker).getTemplate().idTemplate; smsg.addNpcName(((L2NpcInstance) attacker).getTemplate().idTemplate);
if (Config.DEBUG)
{
LOGGER.info("mob id:" + mobId);
}
smsg.addNpcName(mobId);
} }
else if (attacker instanceof L2Summon) else if (attacker instanceof L2Summon)
{ {
final int mobId = ((L2Summon) attacker).getTemplate().idTemplate; smsg.addNpcName(((L2Summon) attacker).getTemplate().idTemplate);
smsg.addNpcName(mobId);
} }
else else
{ {
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.gameserver.datatables.csv.DoorTable; import com.l2jmobius.gameserver.datatables.csv.DoorTable;
@@ -230,12 +229,6 @@ public class ClanHall
setEndTime(System.currentTimeMillis() + _rate); setEndTime(System.currentTimeMillis() + _rate);
dbSave(newfc); dbSave(newfc);
getOwnerClan().getWarehouse().destroyItemByItemId("CH_function_fee", 57, fee, null, null); 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); ThreadPool.schedule(new FunctionTask(), _rate);
} }
else else
@@ -305,12 +298,6 @@ public class ClanHall
_clanHallId = clanHallId; _clanHallId = clanHallId;
_name = name; _name = name;
_ownerId = ownerId; _ownerId = ownerId;
if (Config.DEBUG)
{
LOGGER.warning("Init Owner : " + _ownerId);
}
_lease = lease; _lease = lease;
_desc = desc; _desc = desc;
_location = location; _location = location;
@@ -704,11 +691,6 @@ public class ClanHall
*/ */
public boolean updateFunctions(int type, int lvl, int lease, long rate, boolean addNew) 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 (addNew)
{ {
if (ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() < lease) if (ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() < lease)
@@ -724,12 +706,6 @@ public class ClanHall
else else
{ {
final int diffLease = lease - _functions.get(type).getLease(); final int diffLease = lease - _functions.get(type).getLease();
if (Config.DEBUG)
{
LOGGER.warning("Called ClanHall.updateFunctions diffLease : " + diffLease);
}
if (diffLease > 0) if (diffLease > 0)
{ {
if (ClanTable.getInstance().getClan(_ownerId).getWarehouse().getAdena() < diffLease) 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); 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()); ThreadPool.schedule(new FeeTask(), _paidUntil - System.currentTimeMillis());
_paid = true; _paid = true;
updateDb(); updateDb();
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.gameserver.datatables.sql.ClanTable; import com.l2jmobius.gameserver.datatables.sql.ClanTable;
import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2Clan;
@@ -191,10 +190,6 @@ public class Hero
catch (SQLException e) catch (SQLException e)
{ {
LOGGER.warning("Hero System: Couldnt load Heroes"); 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 " + _heroes.size() + " Heroes.");
LOGGER.info("Hero System: Loaded " + _completeHeroes.size() + " all time Heroes."); LOGGER.info("Hero System: Loaded " + _completeHeroes.size() + " all time Heroes.");
@@ -204,12 +199,6 @@ public class Hero
{ {
try 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(); final StatsSet newHero = new StatsSet();
newHero.set(Olympiad.CHAR_NAME, player.getName()); newHero.set(Olympiad.CHAR_NAME, player.getName());
newHero.set(Olympiad.CLASS_ID, player.getClassId().getId()); newHero.set(Olympiad.CLASS_ID, player.getClassId().getId());
@@ -486,10 +475,6 @@ public class Hero
catch (SQLException e) catch (SQLException e)
{ {
LOGGER.warning("Hero System: Couldnt update Heroes"); LOGGER.warning("Hero System: Couldnt update Heroes");
if (Config.DEBUG)
{
e.printStackTrace();
}
} }
} }
@@ -770,10 +770,6 @@ public class CTF implements EventTask
{ {
if (!checkStartJoinOk()) if (!checkStartJoinOk())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[startJoin]: startJoinOk() = false");
}
return false; return false;
} }
@@ -919,10 +915,6 @@ public class CTF implements EventTask
{ {
if (!startEventOk()) if (!startEventOk())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[startEvent()]: startEventOk() = false");
}
return false; return false;
} }
@@ -997,10 +989,6 @@ public class CTF implements EventTask
{ {
if (!finishEventOk()) if (!finishEventOk())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[finishEvent]: finishEventOk() = false");
}
return; return;
} }
@@ -2497,10 +2485,6 @@ public class CTF implements EventTask
{ {
if (_inProgress) if (_inProgress)
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[addTeam(" + teamName + ")]: checkTeamOk() = false");
}
return; return;
} }
@@ -2537,19 +2521,11 @@ public class CTF implements EventTask
{ {
if (_inProgress || _teams.isEmpty()) if (_inProgress || _teams.isEmpty())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[removeTeam(" + teamName + ")]: checkTeamOk() = false");
}
return; return;
} }
if (teamPlayersCount(teamName) > 0) if (teamPlayersCount(teamName) > 0)
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[removeTeam(" + teamName + ")]: teamPlayersCount(teamName) > 0");
}
return; return;
} }
@@ -731,10 +731,6 @@ public class DM implements EventTask
{ {
if (!checkStartJoinOk()) if (!checkStartJoinOk())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[startJoin]: startJoinOk() = false");
}
return false; return false;
} }
@@ -863,10 +859,6 @@ public class DM implements EventTask
{ {
if (!startEventOk()) if (!startEventOk())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[startEvent()]: startEventOk() = false");
}
return false; return false;
} }
@@ -949,10 +941,6 @@ public class DM implements EventTask
{ {
if (!finishEventOk()) if (!finishEventOk())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[finishEvent]: finishEventOk() = false");
}
return; return;
} }
@@ -185,11 +185,6 @@ public class Lottery
LOGGER.warning("Lottery: Could not restore lottery data: " + e); LOGGER.warning("Lottery: Could not restore lottery data: " + e);
} }
if (Config.DEBUG)
{
LOGGER.info("Lottery: Starting ticket sell for lottery #" + _number + ".");
}
_isSellingTickets = true; _isSellingTickets = true;
_isStarted = true; _isStarted = true;
@@ -242,13 +237,7 @@ public class Lottery
@Override @Override
public void run() public void run()
{ {
if (Config.DEBUG)
{
LOGGER.info("Lottery: Stopping ticket sell for lottery #" + _number + ".");
}
_isSellingTickets = false; _isSellingTickets = false;
Announcements.getInstance().announceToAll(new SystemMessage(SystemMessageId.LOTTERY_TICKET_SALES_TEMP_SUSPENDED)); Announcements.getInstance().announceToAll(new SystemMessage(SystemMessageId.LOTTERY_TICKET_SALES_TEMP_SUSPENDED));
} }
} }
@@ -262,11 +251,6 @@ public class Lottery
@Override @Override
public void run() public void run()
{ {
if (Config.DEBUG)
{
LOGGER.info("Lottery: Ending lottery #" + _number + ".");
}
final int[] luckynums = new int[5]; final int[] luckynums = new int[5];
int luckynum = 0; int luckynum = 0;
@@ -291,11 +275,6 @@ public class Lottery
luckynums[i] = luckynum; 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 enchant = 0;
int type2 = 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 count1 = 0;
int count2 = 0; int count2 = 0;
int count3 = 0; int count3 = 0;
@@ -405,22 +379,9 @@ public class Lottery
prize3 = (int) (((_prize - prize4) * Config.ALT_LOTTERY_3_NUMBER_RATE) / count3); 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); final int newprize = _prize - (prize1 + prize2 + prize3 + prize4);
if (Config.DEBUG)
{
LOGGER.info("Lottery: Jackpot for next lottery is " + newprize + ".");
}
SystemMessage sm; SystemMessage sm;
if (count1 > 0) if (count1 > 0)
{ {
// There are winners. // There are winners.
@@ -581,11 +542,6 @@ public class Lottery
res[1] = 200; res[1] = 200;
} }
} }
if (Config.DEBUG)
{
LOGGER.warning("count: " + count + ", id: " + id + ", enchant: " + enchant + ", type2: " + type2);
}
} }
rset.close(); rset.close();
@@ -735,10 +735,6 @@ public class TvT implements EventTask
{ {
if (!checkStartJoinOk()) if (!checkStartJoinOk())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[startJoin]: startJoinOk() = false");
}
return false; return false;
} }
@@ -848,10 +844,6 @@ public class TvT implements EventTask
{ {
if (!startEventOk()) if (!startEventOk())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[startEvent()]: startEventOk() = false");
}
return false; return false;
} }
@@ -916,10 +908,6 @@ public class TvT implements EventTask
{ {
if (!finishEventOk()) if (!finishEventOk())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[finishEvent]: finishEventOk() = false");
}
return; return;
} }
@@ -2386,10 +2374,6 @@ public class TvT implements EventTask
{ {
if (_inProgress) if (_inProgress)
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[addTeam(" + teamName + ")]: checkTeamOk() = false");
}
return; return;
} }
@@ -2426,24 +2410,15 @@ public class TvT implements EventTask
{ {
if (_inProgress || _teams.isEmpty()) if (_inProgress || _teams.isEmpty())
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[removeTeam(" + teamName + ")]: checkTeamOk() = false");
}
return; return;
} }
if (teamPlayersCount(teamName) > 0) if (teamPlayersCount(teamName) > 0)
{ {
if (Config.DEBUG)
{
LOGGER.warning(_eventName + " Engine[removeTeam(" + teamName + ")]: teamPlayersCount(teamName) > 0");
}
return; return;
} }
final int index = _teams.indexOf(teamName); final int index = _teams.indexOf(teamName);
if (index == -1) if (index == -1)
{ {
return; return;
@@ -19,10 +19,8 @@ package com.l2jmobius.gameserver.model.entity.event.manager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Iterator;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
/** /**
@@ -94,35 +92,6 @@ public class EventsGlobalTask implements Runnable
} }
eventid_to_tasks.put(event.getEventIdentifier(), savedTasksForId); 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<EventTask> tasks = time_to_tasks.get(time);
final Iterator<EventTask> 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<EventTask> times = eventid_to_tasks.get(event_id);
final Iterator<EventTask> timesIt = times.iterator();
while (timesIt.hasNext())
{
final EventTask actual_time = timesIt.next();
LOGGER.info(" --Registered Time: " + actual_time.getEventStartTime());
}
}
}
} }
public void clearEventTasksByEventName(String eventId) public void clearEventTasksByEventName(String eventId)
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.olympiad.Olympiad.COMP_TYPE; import com.l2jmobius.gameserver.model.entity.olympiad.Olympiad.COMP_TYPE;
@@ -121,11 +120,6 @@ class OlympiadManager implements Runnable
} }
catch (Exception ex) catch (Exception ex)
{ {
if (Config.DEBUG)
{
LOGGER.warning("Olympiad Manager: Stadium - " + i + " assignment, an error has been occurred: " + ex);
}
if (_olympiadInstances.get(i) != null) if (_olympiadInstances.get(i) != null)
{ {
for (L2PcInstance player : _olympiadInstances.get(i).getPlayers()) for (L2PcInstance player : _olympiadInstances.get(i).getPlayers())
@@ -159,11 +153,6 @@ class OlympiadManager implements Runnable
} }
catch (Exception ex) catch (Exception ex)
{ {
if (Config.DEBUG)
{
LOGGER.warning("Olympiad Manager: Stadium - " + i + " assignment, an error has been occurred: " + ex);
}
if (_olympiadInstances.get(i) != null) if (_olympiadInstances.get(i) != null)
{ {
for (L2PcInstance player : _olympiadInstances.get(i).getPlayers()) for (L2PcInstance player : _olympiadInstances.get(i).getPlayers())
@@ -197,11 +186,6 @@ class OlympiadManager implements Runnable
} }
catch (Exception ex) catch (Exception ex)
{ {
if (Config.DEBUG)
{
LOGGER.warning("Olympiad Manager: Stadium - " + i + " assignment, an error has been occurred: " + ex);
}
if (_olympiadInstances.get(i) != null) if (_olympiadInstances.get(i) != null)
{ {
for (L2PcInstance player : _olympiadInstances.get(i).getPlayers()) for (L2PcInstance player : _olympiadInstances.get(i).getPlayers())
@@ -234,11 +218,6 @@ class OlympiadManager implements Runnable
} }
catch (Exception ex) catch (Exception ex)
{ {
if (Config.DEBUG)
{
LOGGER.warning("Olympiad Manager: Stadium - " + i + " assignment, an error has been occurred: " + ex);
}
if (_olympiadInstances.get(i) != null) if (_olympiadInstances.get(i) != null)
{ {
for (L2PcInstance player : _olympiadInstances.get(i).getPlayers()) for (L2PcInstance player : _olympiadInstances.get(i).getPlayers())
@@ -902,11 +902,6 @@ public class SevenSigns
sevenDat.set("ancient_adena_amount", rset.getDouble("ancient_adena_amount")); sevenDat.set("ancient_adena_amount", rset.getDouble("ancient_adena_amount"));
sevenDat.set("contribution_score", rset.getDouble("contribution_score")); 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); _signsPlayerData.put(charObjId, sevenDat);
} }
@@ -965,11 +960,6 @@ public class SevenSigns
*/ */
public void saveSevenSignsData(L2PcInstance player, boolean updateSettings) public void saveSevenSignsData(L2PcInstance player, boolean updateSettings)
{ {
if (Config.DEBUG)
{
LOGGER.info("SevenSigns: Saving data to disk.");
}
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection())
{ {
PreparedStatement statement = null; PreparedStatement statement = null;
@@ -996,11 +986,6 @@ public class SevenSigns
statement.execute(); statement.execute();
statement.close(); 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) if (updateSettings)
@@ -1042,11 +1027,6 @@ public class SevenSigns
statement.execute(); statement.execute();
statement.close(); statement.close();
if (Config.DEBUG)
{
LOGGER.info("SevenSigns: Updated data in database.");
}
} }
} }
catch (SQLException e) catch (SQLException e)
@@ -1061,11 +1041,6 @@ public class SevenSigns
*/ */
protected void resetPlayerData() 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. // Reset each player's contribution data as well as seal and cabal.
for (StatsSet sevenDat : _signsPlayerData.values()) for (StatsSet sevenDat : _signsPlayerData.values())
{ {
@@ -1135,11 +1110,6 @@ public class SevenSigns
statement.setInt(3, chosenSeal); statement.setInt(3, chosenSeal);
statement.execute(); statement.execute();
statement.close(); 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) catch (SQLException e)
{ {
@@ -1159,11 +1129,6 @@ public class SevenSigns
saveSevenSignsData(player, true); saveSevenSignsData(player, true);
if (Config.DEBUG)
{
LOGGER.info("SevenSigns: " + player.getName() + " has joined the " + getCabalName(chosenCabal) + " for the " + getSealName(chosenSeal, false) + "!");
}
return chosenCabal; return chosenCabal;
} }
@@ -1237,11 +1202,6 @@ public class SevenSigns
saveSevenSignsData(player, true); saveSevenSignsData(player, true);
if (Config.DEBUG)
{
LOGGER.info("SevenSigns: " + player.getName() + " contributed " + contribScore + " seal stone points to their cabal.");
}
return contribScore; return contribScore;
} }
@@ -1369,13 +1329,6 @@ public class SevenSigns
*/ */
protected void calcNewSealOwners() 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()) for (Integer currSeal : _signsDawnSealTotals.keySet())
{ {
final int prevSealOwner = _signsSealOwners.get(currSeal); final int prevSealOwner = _signsSealOwners.get(currSeal);
@@ -3318,11 +3318,6 @@ public class SevenSignsFestival implements SpawnListener
*/ */
protected void restoreFestivalData() protected void restoreFestivalData()
{ {
if (Config.DEBUG)
{
LOGGER.info("SevenSignsFestival: Restoring festival data. Current SS Cycle: " + _signsCycle);
}
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection())
{ {
PreparedStatement statement = con.prepareStatement("SELECT festivalId, cabal, cycle, date, score, members FROM seven_signs_festival"); 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("score", rset.getInt("score"));
festivalDat.set("members", rset.getString("members")); 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")) if (cabal.equals("dawn"))
{ {
festivalId += FESTIVAL_COUNT; festivalId += FESTIVAL_COUNT;
@@ -3391,11 +3381,6 @@ public class SevenSignsFestival implements SpawnListener
} }
} }
if (Config.DEBUG)
{
LOGGER.info("SevenSignsFestival: Loaded data from database.");
}
rset.close(); rset.close();
statement.close(); statement.close();
} }
@@ -3411,11 +3396,6 @@ public class SevenSignsFestival implements SpawnListener
*/ */
public void saveFestivalData(boolean updateSettings) public void saveFestivalData(boolean updateSettings)
{ {
if (Config.DEBUG)
{
LOGGER.info("SevenSignsFestival: Saving festival data to disk.");
}
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection())
{ {
PreparedStatement statement = null; 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 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 (statement.executeUpdate() > 0)
{ {
if (Config.DEBUG)
{
LOGGER.info("SevenSignsFestival: Updated data in DB (Cycle = " + festivalCycle + ", Cabal = " + cabal + ", FestID = " + festivalId + ")");
}
statement.close(); statement.close();
continue; continue;
} }
@@ -3460,11 +3435,6 @@ public class SevenSignsFestival implements SpawnListener
statement.setString(6, festivalDat.getString("members")); statement.setString(6, festivalDat.getString("members"));
statement.execute(); statement.execute();
statement.close(); 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) if (festivalParty != null)
{ {
participants = festivalParty.getPartyMembers(); 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) if (oracle == SevenSigns.CABAL_DAWN)
@@ -3994,11 +3959,6 @@ public class SevenSignsFestival implements SpawnListener
currData = new StatsSet(); currData = new StatsSet();
currData.set("score", 0); currData.set("score", 0);
currData.set("members", ""); currData.set("members", "");
if (Config.DEBUG)
{
LOGGER.info("SevenSignsFestival: Data missing for " + SevenSigns.getCabalName(oracle) + ", FestivalID = " + festivalId + " (Current Cycle " + _signsCycle + ")");
}
} }
return currData; return currData;
@@ -4101,11 +4061,6 @@ public class SevenSignsFestival implements SpawnListener
currFestData.set("score", offeringScore); currFestData.set("score", offeringScore);
currFestData.set("members", Util.implodeString(partyMembers, ",")); 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. // Only add the score to the cabal's overall if it's higher than the other cabal's score.
if (offeringScore > otherCabalHighScore) 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 the spawned NPC ID matches the ones we need, assign their instances.
if (npcId == 31127) if (npcId == 31127)
{ {
if (Config.DEBUG)
{
LOGGER.info("SevenSignsFestival: Instance found for NPC ID 31127 (" + npc.getObjectId() + ").");
}
_dawnChatGuide = npc; _dawnChatGuide = npc;
} }
if (npcId == 31137) if (npcId == 31137)
{ {
if (Config.DEBUG)
{
LOGGER.info("SevenSignsFestival: Instance found for NPC ID 31137 (" + npc.getObjectId() + ").");
}
_duskChatGuide = npc; _duskChatGuide = npc;
} }
} }
@@ -4337,11 +4282,6 @@ public class SevenSignsFestival implements SpawnListener
return; 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."); sendMessageToAll("Festival Guide", "The main event will start in " + getMinsToNextFestival() + " minutes. Please register now.");
// Stand by until the allowed signup period has elapsed. // Stand by until the allowed signup period has elapsed.
@@ -4387,11 +4327,6 @@ public class SevenSignsFestival implements SpawnListener
setNextFestivalStart(Config.ALT_FESTIVAL_CYCLE_LENGTH); setNextFestivalStart(Config.ALT_FESTIVAL_CYCLE_LENGTH);
sendMessageToAll("Festival Guide", "The main event is now starting."); 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. // Stand by for a short length of time before starting the festival.
try try
{ {
@@ -4414,11 +4349,6 @@ public class SevenSignsFestival implements SpawnListener
festivalInst.sendMessageToParticipants("The festival is about to begin!"); 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. // After a short time period, move all idle spawns to the center of the arena.
try try
{ {
@@ -4514,11 +4444,6 @@ public class SevenSignsFestival implements SpawnListener
_festivalInitialized = false; _festivalInitialized = false;
sendMessageToAll("Festival Witch", "That will do! I'll move you to the outside soon."); 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() 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. // Teleport all players to arena and notify them.
if (_participants.size() > 0) if (_participants.size() > 0)
{ {
@@ -4663,11 +4583,6 @@ public class SevenSignsFestival implements SpawnListener
SpawnTable.getInstance().addNewSpawn(npcSpawn, false); SpawnTable.getInstance().addNewSpawn(npcSpawn, false);
_witchInst = npcSpawn.doSpawn(); _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) catch (Exception e)
{ {
@@ -4691,11 +4606,6 @@ public class SevenSignsFestival implements SpawnListener
*/ */
protected void festivalStart() protected void festivalStart()
{ {
if (Config.DEBUG)
{
LOGGER.info("SevenSignsFestival: Starting festival for " + SevenSigns.getCabalShortName(_cabal) + " (" + getFestivalName(_levelRange) + ")");
}
spawnFestivalMonsters(FESTIVAL_DEFAULT_RESPAWN, 0); spawnFestivalMonsters(FESTIVAL_DEFAULT_RESPAWN, 0);
} }
@@ -4704,11 +4614,6 @@ public class SevenSignsFestival implements SpawnListener
*/ */
protected void moveMonstersToCenter() 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) for (L2FestivalMonsterInstance festivalMob : _npcInsts)
{ {
if (festivalMob.isDead()) if (festivalMob.isDead())
@@ -4825,11 +4730,6 @@ public class SevenSignsFestival implements SpawnListener
} }
_npcInsts.add(festivalMob); _npcInsts.add(festivalMob);
if (Config.DEBUG)
{
LOGGER.info("SevenSignsFestival: Spawned NPC ID " + currSpawn._npcId + " at " + currSpawn._x + " " + currSpawn._y + " " + currSpawn._z);
}
} }
catch (Exception e) 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. // Set this flag to true to make sure that this can only be done once.
_challengeIncreased = true; _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. // Spawn more festival monsters, but this time with a twist.
spawnFestivalMonsters(FESTIVAL_DEFAULT_RESPAWN, 1); spawnFestivalMonsters(FESTIVAL_DEFAULT_RESPAWN, 1);
return true; return true;
@@ -4890,11 +4785,6 @@ public class SevenSignsFestival implements SpawnListener
*/ */
protected void festivalEnd() protected void festivalEnd()
{ {
if (Config.DEBUG)
{
LOGGER.info("SevenSignsFestival: Ending festival for " + SevenSigns.getCabalShortName(_cabal) + " (" + getFestivalName(_levelRange) + ")");
}
if (_participants.size() > 0) if (_participants.size() > 0)
{ {
for (L2PcInstance participant : _participants) for (L2PcInstance participant : _participants)
@@ -39,7 +39,6 @@ import com.l2jmobius.gameserver.instancemanager.CrownManager;
import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.L2Manor; import com.l2jmobius.gameserver.model.L2Manor;
import com.l2jmobius.gameserver.model.L2Object; 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.L2DoorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Announcements; import com.l2jmobius.gameserver.model.entity.Announcements;
@@ -1234,15 +1233,6 @@ public class Castle
public void oustAllPlayers() 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(); _teleZone.oustAllPlayers();
} }
@@ -389,24 +389,6 @@ public class Quest extends ManagedScript
*/ */
public synchronized void startQuestTimer(String name, long time, L2NpcInstance npc, L2PcInstance player, boolean repeating) 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) synchronized (_allEventTimers)
{ {
ArrayList<QuestTimer> timers = _allEventTimers.get(name); ArrayList<QuestTimer> timers = _allEventTimers.get(name);
@@ -1134,11 +1116,6 @@ public class Quest extends ManagedScript
*/ */
public static final void playerEnter(L2PcInstance player) public static final void playerEnter(L2PcInstance player)
{ {
if (Config.DEBUG)
{
LOGGER.info("Quest.playerEnter " + player.getName());
}
if (Config.ALT_DEV_NO_QUESTS) if (Config.ALT_DEV_NO_QUESTS)
{ {
return; return;
@@ -1167,10 +1144,6 @@ public class Quest extends ManagedScript
if (q == null) if (q == null)
{ {
if (Config.DEVELOPER)
{
LOGGER.info("Unknown quest " + questId + " for player " + player.getName());
}
if (Config.AUTODELETE_INVALID_QUEST_DATA) if (Config.AUTODELETE_INVALID_QUEST_DATA)
{ {
invalidQuestData.setInt(1, player.getObjectId()); invalidQuestData.setInt(1, player.getObjectId());
@@ -1207,11 +1180,6 @@ public class Quest extends ManagedScript
if (qs == null) if (qs == null)
{ {
if (Config.DEVELOPER)
{
LOGGER.info("Lost variable " + var + " in quest " + questId + " for player " + player.getName());
}
if (Config.AUTODELETE_INVALID_QUEST_DATA) if (Config.AUTODELETE_INVALID_QUEST_DATA)
{ {
invalidQuestDataVar.setInt(1, player.getObjectId()); invalidQuestDataVar.setInt(1, player.getObjectId());
@@ -28,7 +28,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
@@ -92,7 +91,6 @@ public class AutoSpawn
private void restoreSpawnData() private void restoreSpawnData()
{ {
int numLoaded = 0;
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection())
{ {
PreparedStatement statement = null; PreparedStatement statement = null;
@@ -112,7 +110,6 @@ public class AutoSpawn
spawnInst.setSpawnCount(rs.getInt("count")); spawnInst.setSpawnCount(rs.getInt("count"));
spawnInst.setBroadcast(rs.getBoolean("broadcastSpawn")); spawnInst.setBroadcast(rs.getBoolean("broadcastSpawn"));
spawnInst.setRandomSpawn(rs.getBoolean("randomSpawn")); spawnInst.setRandomSpawn(rs.getBoolean("randomSpawn"));
numLoaded++;
// Restore the spawn locations for this spawn group/instance. // Restore the spawn locations for this spawn group/instance.
statement2 = con.prepareStatement("SELECT * FROM random_spawn_loc WHERE groupId=?"); statement2 = con.prepareStatement("SELECT * FROM random_spawn_loc WHERE groupId=?");
@@ -131,11 +128,6 @@ public class AutoSpawn
statement.close(); statement.close();
rs.close(); rs.close();
if (Config.DEBUG)
{
LOGGER.info("AutoSpawnHandler: Loaded " + numLoaded + " spawn group(s) from the database.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -188,12 +180,6 @@ public class AutoSpawn
} }
setSpawnActive(newSpawn, true); setSpawnActive(newSpawn, true);
if (Config.DEBUG)
{
LOGGER.info("AutoSpawnHandler: Registered auto spawn for NPC ID " + npcId + " (Object ID = " + newId + ").");
}
return newSpawn; return newSpawn;
} }
@@ -245,11 +231,6 @@ public class AutoSpawn
return false; return false;
} }
} }
if (Config.DEBUG)
{
LOGGER.info("AutoSpawnHandler: Removed auto spawn for NPC ID " + spawnInst._npcId + " (Object ID = " + spawnInst._objectId + ").");
}
} }
return true; return true;
@@ -585,11 +566,6 @@ public class AutoSpawn
Announcements.getInstance().announceToAll("The " + npcInst.getName() + " has spawned near " + nearestTown + "!"); 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 there is no despawn time, do not create a despawn task.
if (spawnInst.getDespawnDelay() > 0) if (spawnInst.getDespawnDelay() > 0)
{ {
@@ -653,11 +629,6 @@ public class AutoSpawn
npcInst.deleteMe(); npcInst.deleteMe();
spawnInst.removeNpcInstance(npcInst); spawnInst.removeNpcInstance(npcInst);
if (Config.DEBUG)
{
LOGGER.info("AutoSpawnHandler: Spawns removed for spawn instance (Object ID = " + _objectId + ").");
}
} }
} }
catch (Exception e) catch (Exception e)
@@ -18,7 +18,6 @@ package com.l2jmobius.gameserver.model.spawn;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.datatables.sql.TerritoryTable; import com.l2jmobius.gameserver.datatables.sql.TerritoryTable;
import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.idfactory.IdFactory;
@@ -105,11 +104,6 @@ public class L2GroupSpawn extends L2Spawn
mob.spawnMe(newlocx, newlocy, newlocz); mob.spawnMe(newlocx, newlocy, newlocz);
mob.onSpawn(); mob.onSpawn();
if (Config.DEBUG)
{
LOGGER.info("spawned Mob ID: " + _template.npcId + " ,at: " + mob.getX() + " x, " + mob.getY() + " y, " + mob.getZ() + " z");
}
return mob; return mob;
} }

Some files were not shown because too many files have changed in this diff Show More