Refactored logger variables to caps.

This commit is contained in:
MobiusDev
2018-04-11 12:23:51 +00:00
parent 847ff1fa4f
commit f6ee0584bf
2180 changed files with 7679 additions and 7634 deletions

View File

@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
*/
public abstract class AbstractNpcAI extends Quest
{
protected final Logger _log = Logger.getLogger(getClass().getName());
protected final Logger LOGGER = Logger.getLogger(getClass().getName());
public AbstractNpcAI()
{

View File

@@ -628,7 +628,7 @@ public final class Antharas extends AbstractNpcAI
{
if (!zone.isCharacterInZone(attacker) || (getStatus() != IN_FIGHT))
{
_log.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!");
LOGGER.warning(getClass().getSimpleName() + ": Player " + attacker.getName() + " attacked Antharas in invalid conditions!");
attacker.teleToLocation(80464, 152294, -3534);
}

View File

@@ -1245,7 +1245,7 @@ public final class CastleChamberlain extends AbstractNpcAI
}
default:
{
_log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!");
LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!");
}
}
}

View File

@@ -60,7 +60,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
"watchmatch",
"arenachange"
};
private static final Logger _LOG = Logger.getLogger(OlyManager.class.getName());
private static final Logger LOGGER = Logger.getLogger(OlyManager.class.getName());
private OlyManager()
{
@@ -351,7 +351,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
final List<Location> spectatorSpawns = nextArena.getStadium().getZone().getSpectatorSpawns();
if (spectatorSpawns.isEmpty())
{
_LOG.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!");
LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!");
return false;
}
final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size()));
@@ -362,7 +362,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
catch (Exception e)
{
_LOG.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
}
return false;
}

View File

@@ -88,7 +88,7 @@ public final class Elpies extends Event
// Check Custom Table - we use custom NPCs
if (!Config.CUSTOM_NPC_DATA)
{
_log.info(getName() + ": Event can't be started because custom NPC table is disabled!");
LOGGER.info(getName() + ": Event can't be started because custom NPC table is disabled!");
eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!");
return false;
}

View File

@@ -95,7 +95,7 @@ public final class Rabbits extends Event
// Check starting conditions
if (!Config.CUSTOM_NPC_DATA)
{
_log.info(getName() + ": Event can't be started, because custom NPCs are disabled!");
LOGGER.info(getName() + ": Event can't be started, because custom NPCs are disabled!");
eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPCs are disabled!");
return false;
}

View File

@@ -121,7 +121,7 @@ public final class Race extends Event
// Check Custom Table - we use custom NPCs
if (!Config.CUSTOM_NPC_DATA)
{
_log.info(getName() + ": Event can't be started, because custom npc table is disabled!");
LOGGER.info(getName() + ": Event can't be started, because custom npc table is disabled!");
eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!");
return false;
}

View File

@@ -63,7 +63,7 @@ public class ListenerTest extends AbstractNpcAI
// Manual listener registration
Containers.Global().addListener(new ConsumerEventListener(Containers.Global(), EventType.ON_PLAYER_DLG_ANSWER, (OnPlayerDlgAnswer event) ->
{
_log.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId());
LOGGER.info(getClass().getSimpleName() + ": " + event.getActiveChar() + " OnPlayerDlgAnswer: Answer: " + event.getAnswer() + " MessageId: " + event.getMessageId());
}, this));
}
@@ -73,7 +73,7 @@ public class ListenerTest extends AbstractNpcAI
*/
private void onAttackableAttack(OnAttackableAttack event)
{
_log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill());
LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget() + " damage: " + event.getDamage() + " skill: " + event.getSkill());
}
/**
@@ -88,7 +88,7 @@ public class ListenerTest extends AbstractNpcAI
@Id(22228)
private void onCreatureKill(OnCreatureDeath event)
{
_log.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget());
LOGGER.info(getClass().getSimpleName() + ": " + event.getClass().getSimpleName() + " invoked attacker: " + event.getAttacker() + " target: " + event.getTarget());
}
/**
@@ -101,7 +101,7 @@ public class ListenerTest extends AbstractNpcAI
@Range(from = 1, to = 9)
private void onSiegeStart(OnCastleSiegeStart event)
{
_log.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!");
LOGGER.info(getClass().getSimpleName() + ": The siege of " + event.getSiege().getCastle().getName() + " (" + event.getSiege().getCastle().getResidenceId() + ") has started!");
}
/**
@@ -114,7 +114,7 @@ public class ListenerTest extends AbstractNpcAI
@Id(5575)
private void onItemCreate(OnItemCreate event)
{
_log.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference());
LOGGER.info(getClass().getSimpleName() + ": Item [" + event.getItem() + "] has been created actor: " + event.getActiveChar() + " process: " + event.getProcess() + " reference: " + event.getReference());
}
/**
@@ -152,7 +152,7 @@ public class ListenerTest extends AbstractNpcAI
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLogin(OnPlayerLogin event)
{
_log.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!");
LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getActiveChar() + " has logged in!");
}
/**
@@ -170,7 +170,7 @@ public class ListenerTest extends AbstractNpcAI
{
if (event.getTarget().isGM())
{
_log.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!");
LOGGER.info(getClass().getSimpleName() + ": Player: " + event.getTarget() + " was prevented from dying!");
return new TerminateReturn(true, true, true);
}
return null;

View File

@@ -341,7 +341,7 @@ import handlers.voicedcommandhandlers.StatsVCmd;
*/
public class MasterHandler
{
private static final Logger _log = Logger.getLogger(MasterHandler.class.getName());
private static final Logger LOGGER = Logger.getLogger(MasterHandler.class.getName());
private static final IHandler<?, ?>[] LOAD_INSTANCES =
{
@@ -680,7 +680,7 @@ public class MasterHandler
public static void main(String[] args)
{
_log.info("Loading Handlers...");
LOGGER.info("Loading Handlers...");
final Map<IHandler<?, ?>, Method> registerHandlerMethods = new HashMap<>();
for (IHandler<?, ?> loadInstance : LOAD_INSTANCES)
@@ -697,7 +697,7 @@ public class MasterHandler
registerHandlerMethods.entrySet().stream().filter(e -> e.getValue() == null).forEach(e ->
{
_log.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist.");
LOGGER.warning("Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist.");
});
for (Class<?> classes[] : HANDLERS)
@@ -722,7 +722,7 @@ public class MasterHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e);
LOGGER.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e);
continue;
}
}
@@ -759,9 +759,9 @@ public class MasterHandler
for (IHandler<?, ?> loadInstance : LOAD_INSTANCES)
{
_log.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers");
LOGGER.info(loadInstance.getClass().getSimpleName() + ": Loaded " + loadInstance.size() + " Handlers");
}
_log.info("Handlers Loaded...");
LOGGER.info("Handlers Loaded...");
}
}

View File

@@ -34,7 +34,7 @@ public class L2StaticObjectInstanceAction implements IActionHandler
final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target;
if (staticObject.getType() < 0)
{
_log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId());
LOGGER.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getId());
}
// Check if the L2PcInstance already target the L2NpcInstance

View File

@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.util.Util;
*/
public class AdminAdmin implements IAdminCommandHandler
{
private static final Logger _log = Logger.getLogger(AdminAdmin.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminAdmin.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -121,7 +121,7 @@ public class AdminAdmin implements IAdminCommandHandler
}
catch (Exception e)
{
_log.warning("An error occured while ending olympiad: " + e);
LOGGER.warning("An error occured while ending olympiad: " + e);
}
activeChar.sendMessage("Heroes formed.");
}

View File

@@ -67,7 +67,7 @@ import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
*/
public class AdminEditChar implements IAdminCommandHandler
{
private static Logger _log = Logger.getLogger(AdminEditChar.class.getName());
private static Logger LOGGER = Logger.getLogger(AdminEditChar.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -218,7 +218,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
if (Config.DEVELOPER)
{
_log.warning("Set reputation error: " + e);
LOGGER.warning("Set reputation error: " + e);
}
activeChar.sendMessage("Usage: //setreputation <new_reputation_value>");
}
@@ -261,7 +261,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
if (Config.DEVELOPER)
{
_log.warning("Set pk error: " + e);
LOGGER.warning("Set pk error: " + e);
}
activeChar.sendMessage("Usage: //setpk <pk_count>");
}
@@ -291,7 +291,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
if (Config.DEVELOPER)
{
_log.warning("Set pvp error: " + e);
LOGGER.warning("Set pvp error: " + e);
}
activeChar.sendMessage("Usage: //setpvp <pvp_count>");
}
@@ -321,7 +321,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
if (Config.DEVELOPER)
{
_log.warning("Set Fame error: " + e);
LOGGER.warning("Set Fame error: " + e);
}
activeChar.sendMessage("Usage: //setfame <new_fame_value>");
}

View File

@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
*/
public class AdminEnchant implements IAdminCommandHandler
{
private static Logger _log = Logger.getLogger(AdminEnchant.class.getName());
private static Logger LOGGER = Logger.getLogger(AdminEnchant.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -146,7 +146,7 @@ public class AdminEnchant implements IAdminCommandHandler
{
if (Config.DEVELOPER)
{
_log.warning("Set enchant error: " + e);
LOGGER.warning("Set enchant error: " + e);
}
activeChar.sendMessage("Please specify a new enchant value.");
}
@@ -154,7 +154,7 @@ public class AdminEnchant implements IAdminCommandHandler
{
if (Config.DEVELOPER)
{
_log.warning("Set enchant error: " + e);
LOGGER.warning("Set enchant error: " + e);
}
activeChar.sendMessage("Please specify a valid new enchant value.");
}

View File

@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
*/
public class AdminHeal implements IAdminCommandHandler
{
private static Logger _log = Logger.getLogger(AdminRes.class.getName());
private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName());
private static final String[] ADMIN_COMMANDS =
{
"admin_heal"
@@ -57,7 +57,7 @@ public class AdminHeal implements IAdminCommandHandler
{
if (Config.DEVELOPER)
{
_log.warning("Heal error: " + e);
LOGGER.warning("Heal error: " + e);
}
activeChar.sendMessage("Incorrect target/radius specified.");
}

View File

@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
*/
public class AdminMenu implements IAdminCommandHandler
{
private static final Logger _log = Logger.getLogger(AdminMenu.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminMenu.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -112,7 +112,7 @@ public class AdminMenu implements IAdminCommandHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "", e);
LOGGER.log(Level.WARNING, "", e);
}
}
else if (command.startsWith("admin_recall_clan_menu"))
@@ -141,7 +141,7 @@ public class AdminMenu implements IAdminCommandHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "", e);
LOGGER.log(Level.WARNING, "", e);
}
}
else if (command.startsWith("admin_goto_char_menu"))
@@ -190,7 +190,7 @@ public class AdminMenu implements IAdminCommandHandler
if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
{
activeChar.sendMessage("You don't have the access right to use this command!");
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
return false;
}
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
@@ -207,7 +207,7 @@ public class AdminMenu implements IAdminCommandHandler
if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
{
activeChar.sendMessage("You don't have the access right to use this command!");
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
return false;
}
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);

View File

@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.util.Util;
*/
public class AdminPunishment implements IAdminCommandHandler
{
private static final Logger _log = Logger.getLogger(AdminPunishment.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminPunishment.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -86,7 +86,7 @@ public class AdminPunishment implements IAdminCommandHandler
}
else
{
_log.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing");
LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment.htm is missing");
}
}
else
@@ -149,7 +149,7 @@ public class AdminPunishment implements IAdminCommandHandler
}
else
{
_log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing");
LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-info.htm is missing");
}
break;
}
@@ -186,7 +186,7 @@ public class AdminPunishment implements IAdminCommandHandler
}
else
{
_log.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing");
LOGGER.warning(getClass().getSimpleName() + ": data/html/admin/punishment-player.htm is missing");
}
break;
}

View File

@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
*/
public class AdminRepairChar implements IAdminCommandHandler
{
private static Logger _log = Logger.getLogger(AdminRepairChar.class.getName());
private static Logger LOGGER = Logger.getLogger(AdminRepairChar.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -101,7 +101,7 @@ public class AdminRepairChar implements IAdminCommandHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "could not repair char:", e);
LOGGER.log(Level.WARNING, "could not repair char:", e);
}
}
}

View File

@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList;
*/
public class AdminShop implements IAdminCommandHandler
{
private static final Logger _log = Logger.getLogger(AdminShop.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminShop.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -106,7 +106,7 @@ public class AdminShop implements IAdminCommandHandler
}
catch (Exception e)
{
_log.warning("admin buylist failed:" + command);
LOGGER.warning("admin buylist failed:" + command);
}
final ProductList buyList = BuyListData.getInstance().getBuyList(val);
@@ -117,7 +117,7 @@ public class AdminShop implements IAdminCommandHandler
}
else
{
_log.warning("no buylist with id:" + val);
LOGGER.warning("no buylist with id:" + val);
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
}
}

View File

@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.QuestList;
*/
public class AdminShowQuests implements IAdminCommandHandler
{
private static final Logger _log = Logger.getLogger(AdminShowQuests.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminShowQuests.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -313,7 +313,7 @@ public class AdminShowQuests implements IAdminCommandHandler
catch (Exception e)
{
actor.sendMessage("There was an error.");
_log.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage());
LOGGER.warning(AdminShowQuests.class.getSimpleName() + ": " + e.getMessage());
}
}

View File

@@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public class AdminSkill implements IAdminCommandHandler
{
private static Logger _log = Logger.getLogger(AdminSkill.class.getName());
private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -526,7 +526,7 @@ public class AdminSkill implements IAdminCommandHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "", e);
LOGGER.log(Level.WARNING, "", e);
}
if (skill != null)
{

View File

@@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
*/
public class AdminSpawn implements IAdminCommandHandler
{
private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminSpawn.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -377,17 +377,17 @@ public class AdminSpawn implements IAdminCommandHandler
default:
case 0:
{
_log.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),");
LOGGER.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),");
break;
}
case 1:
{
_log.info("<spawn npcId=\"" + i + "\" x=\"" + x + "\" y=\"" + y + "\" z=\"" + z + "\" heading=\"" + h + "\" respawn=\"0\" />");
LOGGER.info("<spawn npcId=\"" + i + "\" x=\"" + x + "\" y=\"" + y + "\" z=\"" + z + "\" heading=\"" + h + "\" respawn=\"0\" />");
break;
}
case 2:
{
_log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },");
LOGGER.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },");
break;
}
}

View File

@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
*/
public class AdminSummon implements IAdminCommandHandler
{
private static final Logger _log = Logger.getLogger(AdminSummon.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName());
public static final String[] ADMIN_COMMANDS =
{
@@ -69,7 +69,7 @@ public class AdminSummon implements IAdminCommandHandler
if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
{
activeChar.sendMessage("You don't have the access right to use this command!");
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
return false;
}
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
@@ -81,7 +81,7 @@ public class AdminSummon implements IAdminCommandHandler
if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
{
activeChar.sendMessage("You don't have the access right to use this command!");
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
return false;
}
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);

View File

@@ -50,7 +50,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
*/
public class AdminTeleport implements IAdminCommandHandler
{
private static final Logger _log = Logger.getLogger(AdminTeleport.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminTeleport.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -525,7 +525,7 @@ public class AdminTeleport implements IAdminCommandHandler
if (template1 == null)
{
activeChar.sendMessage("Incorrect monster template.");
_log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template.");
LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' template.");
return;
}
@@ -533,7 +533,7 @@ public class AdminTeleport implements IAdminCommandHandler
if (spawn == null)
{
activeChar.sendMessage("Incorrect monster spawn.");
_log.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn.");
LOGGER.warning("ERROR: NPC " + target.getObjectId() + " has a 'null' spawn.");
return;
}
final int respawnTime = spawn.getRespawnDelay() / 1000;
@@ -575,7 +575,7 @@ public class AdminTeleport implements IAdminCommandHandler
if (spawn == null)
{
activeChar.sendMessage("Incorrect raid spawn.");
_log.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn.");
LOGGER.warning("ERROR: NPC Id" + target.getId() + " has a 'null' spawn.");
return;
}
DBSpawnManager.getInstance().deleteSpawn(spawn, true);

View File

@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
*/
public class AdminUnblockIp implements IAdminCommandHandler
{
private static final Logger _log = Logger.getLogger(AdminUnblockIp.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminUnblockIp.class.getName());
private static final String[] ADMIN_COMMANDS =
{
@@ -68,7 +68,7 @@ public class AdminUnblockIp implements IAdminCommandHandler
private boolean unblockIp(String ipAddress, L2PcInstance activeChar)
{
// LoginServerThread.getInstance().unBlockip(ipAddress);
_log.warning("IP removed by GM " + activeChar.getName());
LOGGER.warning("IP removed by GM " + activeChar.getName());
return true;
}
}

View File

@@ -64,7 +64,7 @@ import ai.AbstractNpcAI;
*/
public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler
{
private static final Logger _log = Logger.getLogger(AdminPathNode.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminPathNode.class.getName());
private final Map<Integer, ZoneNodeHolder> _zones = new ConcurrentHashMap<>();
private static final String[] COMMANDS =
@@ -484,7 +484,7 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler
catch (Exception e)
{
activeChar.sendMessage("Failed writing the dump: " + e.getMessage());
_log.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Failed writing point picking dump for " + activeChar.getName() + ":" + e.getMessage(), e);
}
}
}

View File

@@ -57,7 +57,7 @@ public class Augment implements IBypassHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
}
return false;
}

View File

@@ -54,7 +54,7 @@ public class Buy implements IBypassHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
}
return false;
}

View File

@@ -112,7 +112,7 @@ public class ClanWarehouse implements IBypassHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
}
}
return false;

View File

@@ -54,7 +54,7 @@ public class EventEngine implements IBypassHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
}
return false;
}

View File

@@ -121,7 +121,7 @@ public class ItemAuctionLink implements IBypassHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
}
return true;

View File

@@ -35,13 +35,13 @@ public class Link implements IBypassHandler
final String htmlPath = command.substring(4).trim();
if (htmlPath.isEmpty())
{
_log.warning("Player " + activeChar.getName() + " sent empty link html!");
LOGGER.warning("Player " + activeChar.getName() + " sent empty link html!");
return false;
}
if (htmlPath.contains(".."))
{
_log.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath);
LOGGER.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath);
return false;
}

View File

@@ -59,7 +59,7 @@ public class Multisell implements IBypassHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
}
return false;
}

View File

@@ -62,7 +62,7 @@ public class NpcViewMod implements IBypassHandler
if (!st.hasMoreTokens())
{
_log.warning("Bypass[NpcViewMod] used without enough parameters.");
LOGGER.warning("Bypass[NpcViewMod] used without enough parameters.");
return false;
}
@@ -101,7 +101,7 @@ public class NpcViewMod implements IBypassHandler
{
if (st.countTokens() < 2)
{
_log.warning("Bypass[NpcViewMod] used without enough parameters.");
LOGGER.warning("Bypass[NpcViewMod] used without enough parameters.");
return false;
}
@@ -124,7 +124,7 @@ public class NpcViewMod implements IBypassHandler
}
catch (IllegalArgumentException e)
{
_log.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString);
LOGGER.warning("Bypass[NpcViewMod] unknown drop list scope: " + dropListTypeString);
return false;
}
break;
@@ -571,7 +571,7 @@ public class NpcViewMod implements IBypassHandler
String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/NpcView/DropList.htm");
if (html == null)
{
_log.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found.");
LOGGER.warning(NpcViewMod.class.getSimpleName() + ": The html file data/html/mods/NpcView/DropList.htm could not be found.");
return;
}
html = html.replaceAll("%name%", npc.getName());

View File

@@ -113,7 +113,7 @@ public class Observation implements IBypassHandler
}
catch (NumberFormatException nfe)
{
_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe);
return false;
}

View File

@@ -66,7 +66,7 @@ public class PlayerHelp implements IBypassHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
}
return true;
}

View File

@@ -67,7 +67,7 @@ public class PrivateWarehouse implements IBypassHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
}
return false;
}

View File

@@ -63,7 +63,7 @@ public class Wear implements IBypassHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
LOGGER.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
}
return false;
}
@@ -73,7 +73,7 @@ public class Wear implements IBypassHandler
final ProductList buyList = BuyListData.getInstance().getBuyList(val);
if (buyList == null)
{
_log.warning("BuyList not found! BuyListId:" + val);
LOGGER.warning("BuyList not found! BuyListId:" + val);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

View File

@@ -39,7 +39,7 @@ public final class AttackTrait extends AbstractEffect
{
if (params.isEmpty())
{
_log.warning(getClass().getSimpleName() + ": this effect must have parameters!");
LOGGER.warning(getClass().getSimpleName() + ": this effect must have parameters!");
return;
}

View File

@@ -74,7 +74,7 @@ public final class CallSkill extends AbstractEffect
}
else
{
_log.warning("Skill not found effect called from " + skill);
LOGGER.warning("Skill not found effect called from " + skill);
}
}
}

View File

@@ -66,7 +66,7 @@ public final class CallSkillOnActionTime extends AbstractEffect
}
else
{
_log.warning("Skill not found effect called from " + skill);
LOGGER.warning("Skill not found effect called from " + skill);
}
return skill.isToggle();
}

View File

@@ -39,7 +39,7 @@ public final class DefenceTrait extends AbstractEffect
{
if (params.isEmpty())
{
_log.warning(getClass().getSimpleName() + ": must have parameters.");
LOGGER.warning(getClass().getSimpleName() + ": must have parameters.");
return;
}
@@ -57,11 +57,11 @@ public final class DefenceTrait extends AbstractEffect
}
catch (NumberFormatException e)
{
_log.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found.");
LOGGER.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found.");
}
catch (Exception e)
{
_log.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey());
LOGGER.warning(getClass().getSimpleName() + ": value of L2TraitType enum required but found: " + param.getKey());
}
}
}

View File

@@ -48,7 +48,7 @@ public final class Disarmor extends AbstractEffect
_slot = ItemTable.SLOTS.getOrDefault(slot, L2Item.SLOT_NONE);
if (_slot == L2Item.SLOT_NONE)
{
_log.severe("Unknown bodypart slot for effect: " + slot);
LOGGER.severe("Unknown bodypart slot for effect: " + slot);
}
}

View File

@@ -59,7 +59,7 @@ public final class Restoration extends AbstractEffect
if ((_itemId <= 0) || (_itemCount <= 0))
{
effected.sendPacket(SystemMessageId.THERE_WAS_NOTHING_FOUND_INSIDE);
_log.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!");
LOGGER.warning(Restoration.class.getSimpleName() + " effect with wrong item Id/count: " + _itemId + "/" + _itemCount + "!");
return;
}

View File

@@ -97,7 +97,7 @@ public final class Summon extends AbstractEffect
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
{
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
_log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
}
else
{

View File

@@ -38,7 +38,7 @@ public final class SummonAgathion extends AbstractEffect
{
if (params.isEmpty())
{
_log.warning(getClass().getSimpleName() + ": must have parameters.");
LOGGER.warning(getClass().getSimpleName() + ": must have parameters.");
}
_npcId = params.getInt("npcId", 0);

View File

@@ -64,7 +64,7 @@ public final class SummonCubic extends AbstractEffect
if (_cubicId < 0)
{
_log.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId());
LOGGER.warning(SummonCubic.class.getSimpleName() + ": Invalid Cubic ID:" + _cubicId + " in skill ID: " + skill.getId());
return;
}

View File

@@ -66,7 +66,7 @@ public class SummonHallucination extends AbstractEffect
if ((_npcId <= 0) || (_npcCount <= 0))
{
_log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId());
LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId());
return;
}
@@ -79,7 +79,7 @@ public class SummonHallucination extends AbstractEffect
final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId);
if (npcTemplate == null)
{
_log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId());
LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId());
return;
}

View File

@@ -87,7 +87,7 @@ public final class SummonMulti extends AbstractEffect
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
{
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
_log.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
}
else
{

View File

@@ -80,7 +80,7 @@ public final class SummonNpc extends AbstractEffect
if ((_npcId <= 0) || (_npcCount <= 0))
{
_log.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId());
LOGGER.warning(SummonNpc.class.getSimpleName() + ": Invalid NPC ID or count skill ID: " + skill.getId());
return;
}
@@ -93,7 +93,7 @@ public final class SummonNpc extends AbstractEffect
final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId);
if (npcTemplate == null)
{
_log.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId());
LOGGER.warning(SummonNpc.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + _npcId + ", skill ID:" + skill.getId());
return;
}
@@ -162,7 +162,7 @@ public final class SummonNpc extends AbstractEffect
}
catch (Exception e)
{
_log.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e);
LOGGER.log(Level.WARNING, SummonNpc.class.getSimpleName() + ": Unable to create spawn. " + e.getMessage(), e);
return;
}

View File

@@ -75,14 +75,14 @@ public final class SummonPet extends AbstractEffect
final PetItemHolder holder = player.removeScript(PetItemHolder.class);
if (holder == null)
{
_log.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable());
LOGGER.log(Level.WARNING, "Summoning pet without attaching PetItemHandler!", new Throwable());
return;
}
final L2ItemInstance collar = holder.getItem();
if (player.getInventory().getItemByObjectId(collar.getObjectId()) != collar)
{
_log.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns.");
LOGGER.warning("Player: " + player + " is trying to summon pet from item that he doesn't owns.");
return;
}

View File

@@ -57,7 +57,7 @@ public final class SummonTrap extends AbstractEffect
if (_npcId <= 0)
{
_log.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId());
LOGGER.warning(SummonTrap.class.getSimpleName() + ": Invalid NPC ID:" + _npcId + " in skill ID: " + skill.getId());
return;
}
@@ -76,7 +76,7 @@ public final class SummonTrap extends AbstractEffect
final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(_npcId);
if (npcTemplate == null)
{
_log.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId());
LOGGER.warning(SummonTrap.class.getSimpleName() + ": Spawn of the non-existing Trap ID: " + _npcId + " in skill ID:" + skill.getId());
return;
}

View File

@@ -110,7 +110,7 @@ public final class Synergy extends AbstractEffect
}
else
{
_log.warning("Skill not found effect called from " + skill);
LOGGER.warning("Skill not found effect called from " + skill);
}
}

View File

@@ -146,7 +146,7 @@ public final class TriggerSkillByAttack extends AbstractEffect
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
}
if ((target != null) && target.isCharacter())

View File

@@ -64,7 +64,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect
final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType);
if (targetHandler == null)
{
_log.warning("Handler for target type: " + _targetType + " does not exist.");
LOGGER.warning("Handler for target type: " + _targetType + " does not exist.");
return;
}
@@ -81,7 +81,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
}
if ((target != null) && target.isCharacter())

View File

@@ -88,7 +88,7 @@ public final class TriggerSkillByDamage extends AbstractEffect
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
}
if ((target != null) && target.isCharacter())

View File

@@ -91,7 +91,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
}
if ((target != null) && target.isCharacter())

View File

@@ -102,7 +102,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
}
if ((target != null) && target.isCharacter())

View File

@@ -114,7 +114,7 @@ public final class TriggerSkillBySkill extends AbstractEffect
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
}
if ((target != null) && target.isCharacter())

View File

@@ -97,7 +97,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect
final ITargetTypeHandler targetHandler = TargetHandler.getInstance().getHandler(_targetType);
if (targetHandler == null)
{
_log.warning("Handler for target type: " + _targetType + " does not exist.");
LOGGER.warning("Handler for target type: " + _targetType + " does not exist.");
return;
}
@@ -124,7 +124,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
}
if ((target != null) && target.isCharacter())

View File

@@ -90,7 +90,7 @@ public class BeastSoulShot implements IItemHandler
if (skills == null)
{
_log.warning(getClass().getSimpleName() + ": is missing skills!");
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
return false;
}

View File

@@ -92,7 +92,7 @@ public class BeastSpiritShot implements IItemHandler
if (skills == null)
{
_log.warning(getClass().getSimpleName() + ": is missing skills!");
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
return false;
}

View File

@@ -52,7 +52,7 @@ public class BlessedSoulShots implements IItemHandler
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
_log.warning(getClass().getSimpleName() + ": is missing skills!");
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
return false;
}

View File

@@ -48,7 +48,7 @@ public class BlessedSpiritShot implements IItemHandler
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
_log.warning(getClass().getSimpleName() + ": is missing skills!");
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
return false;
}

View File

@@ -59,7 +59,7 @@ public class EventItem implements IItemHandler
}
default:
{
_log.warning("EventItemHandler: Item with id: " + itemId + " is not handled");
LOGGER.warning("EventItemHandler: Item with id: " + itemId + " is not handled");
}
}
return used;
@@ -103,7 +103,7 @@ public class EventItem implements IItemHandler
});
return true;
}
_log.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena");
LOGGER.warning("Char: " + castor.getName() + "[" + castor.getObjectId() + "] has unknown block checker arena");
return false;
}
}

View File

@@ -54,7 +54,7 @@ public class ExtractableItems implements IItemHandler
final List<L2ExtractableProduct> exitems = etcitem.getExtractableItems();
if (exitems == null)
{
_log.info("No extractable data defined for " + etcitem);
LOGGER.info("No extractable data defined for " + etcitem);
return false;
}

View File

@@ -84,7 +84,7 @@ public class FishShots implements IItemHandler
if (skills == null)
{
_log.warning(getClass().getSimpleName() + ": is missing skills!");
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
return false;
}

View File

@@ -51,7 +51,7 @@ public final class Harvester implements IItemHandler
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
_log.warning(getClass().getSimpleName() + ": is missing skills!");
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
return false;
}

View File

@@ -61,7 +61,7 @@ public class ItemSkillsTemplate implements IItemHandler
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
_log.info("Item " + item + " does not have registered any skill for handler.");
LOGGER.info("Item " + item + " does not have registered any skill for handler.");
return false;
}

View File

@@ -49,7 +49,7 @@ public class SoulShots implements IItemHandler
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
_log.warning(getClass().getSimpleName() + ": is missing skills!");
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
return false;
}

View File

@@ -48,7 +48,7 @@ public class SpiritShot implements IItemHandler
final List<ItemSkillHolder> skills = item.getItem().getSkills(ItemSkillType.NORMAL);
if (skills == null)
{
_log.warning(getClass().getSimpleName() + ": is missing skills!");
LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");
return false;
}

View File

@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public class ClanWarsList implements IUserCommandHandler
{
private static final Logger _log = Logger.getLogger(ClanWarsList.class.getName());
private static final Logger LOGGER = Logger.getLogger(ClanWarsList.class.getName());
private static final int[] COMMAND_IDS =
{
88,
@@ -119,7 +119,7 @@ public class ClanWarsList implements IUserCommandHandler
}
catch (Exception e)
{
_log.log(Level.WARNING, "", e);
LOGGER.log(Level.WARNING, "", e);
}
return true;
}

View File

@@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
final InstanceTemplate template = manager.getInstanceTemplate(templateId);
if (template == null)
{
_log.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!");
LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!");
return;
}
@@ -133,7 +133,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
// When nobody can enter
if (enterGroup == null)
{
_log.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!");
LOGGER.warning("Instance " + template.getName() + " (" + templateId + ") has invalid group size limits!");
return;
}
@@ -214,7 +214,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
}
else
{
_log.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")");
LOGGER.warning("Missing start location for instance instance.getName() (" + instance.getId() + ")");
}
}

View File

@@ -169,7 +169,7 @@ import quests.Q11019_TribalBenefit.Q11019_TribalBenefit;
*/
public class QuestMasterHandler
{
private static final Logger _log = Logger.getLogger(QuestMasterHandler.class.getName());
private static final Logger LOGGER = Logger.getLogger(QuestMasterHandler.class.getName());
private static final Class<?>[] QUESTS =
{
@@ -329,7 +329,7 @@ public class QuestMasterHandler
}
catch (Exception e)
{
_log.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e);
LOGGER.log(Level.SEVERE, QuestMasterHandler.class.getSimpleName() + ": Failed loading " + quest.getSimpleName() + ":", e);
}
}
}

View File

@@ -24,7 +24,7 @@ import java.util.logging.Logger;
*/
public abstract class BaseRecievePacket
{
private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName());
private static final Logger LOGGER = Logger.getLogger(BaseRecievePacket.class.getName());
private final byte[] _decrypt;
private int _off;
@@ -78,7 +78,7 @@ public abstract class BaseRecievePacket
}
catch (Exception e)
{
_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage());
}
return result;

View File

@@ -26,7 +26,7 @@ import java.util.logging.Logger;
*/
public abstract class BaseSendablePacket
{
private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName());
private static final Logger LOGGER = Logger.getLogger(BaseSendablePacket.class.getName());
private final ByteArrayOutputStream _bao;
@@ -78,7 +78,7 @@ public abstract class BaseSendablePacket
}
catch (Exception e)
{
_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage());
}
_bao.write(0);
@@ -93,7 +93,7 @@ public abstract class BaseSendablePacket
}
catch (IOException e)
{
_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage());
}
}

View File

@@ -24,7 +24,7 @@ import java.util.logging.Logger;
public class ScrambledKeyPair
{
private static Logger _log = Logger.getLogger(ScrambledKeyPair.class.getName());
private static Logger LOGGER = Logger.getLogger(ScrambledKeyPair.class.getName());
public KeyPair _pair;
public byte[] _scrambledModulus;
@@ -66,7 +66,7 @@ public class ScrambledKeyPair
{
scrambledMod[0x40 + i] = (byte) (scrambledMod[0x40 + i] ^ scrambledMod[i]);
}
_log.finer("Modulus was scrambled");
LOGGER.finer("Modulus was scrambled");
return scrambledMod;
}

View File

@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public class ForumsBBSManager extends BaseBBSManager
{
private static Logger _log = Logger.getLogger(ForumsBBSManager.class.getName());
private static Logger LOGGER = Logger.getLogger(ForumsBBSManager.class.getName());
private final List<Forum> _table;
private int _lastid = 1;
@@ -51,7 +51,7 @@ public class ForumsBBSManager extends BaseBBSManager
}
catch (Exception e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Data error on Forum (root): " + e.getMessage(), e);
}
}
@@ -61,7 +61,7 @@ public class ForumsBBSManager extends BaseBBSManager
public void initRoot()
{
_table.forEach(f -> f.vload());
_log.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid);
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _table.size() + " forums. Last forum id used: " + _lastid);
}
/**

View File

@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
*/
public class CharNameTable
{
private static Logger _log = Logger.getLogger(CharNameTable.class.getName());
private static Logger LOGGER = Logger.getLogger(CharNameTable.class.getName());
private final Map<Integer, String> _chars = new ConcurrentHashMap<>();
private final Map<Integer, Integer> _accessLevels = new ConcurrentHashMap<>();
@@ -114,7 +114,7 @@ public class CharNameTable
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e);
}
if (id > 0)
@@ -162,7 +162,7 @@ public class CharNameTable
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e);
}
return null; // not found
@@ -190,7 +190,7 @@ public class CharNameTable
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing charname: " + e.getMessage(), e);
}
return result;
}
@@ -211,7 +211,7 @@ public class CharNameTable
}
catch (SQLException e)
{
_log.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Couldn't retrieve account for id: " + e.getMessage(), e);
}
return 0;
}
@@ -232,7 +232,7 @@ public class CharNameTable
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e);
}
return 0;
}
@@ -253,7 +253,7 @@ public class CharNameTable
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve class for id: " + e.getMessage(), e);
}
return 0;
}
@@ -274,7 +274,7 @@ public class CharNameTable
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char count: " + e.getMessage(), e);
}
return 0;
}
@@ -294,9 +294,9 @@ public class CharNameTable
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't retrieve all char id/name/access: " + e.getMessage(), e);
}
_log.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names.");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _chars.size() + " char names.");
}
public static CharNameTable getInstance()

View File

@@ -148,7 +148,7 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
*/
public abstract class DocumentBase
{
protected final Logger _log = Logger.getLogger(getClass().getName());
protected final Logger LOGGER = Logger.getLogger(getClass().getName());
private final File _file;
protected final Map<String, String[]> _tables = new HashMap<>();
@@ -171,7 +171,7 @@ public abstract class DocumentBase
}
catch (Exception e)
{
_log.log(Level.SEVERE, "Error loading file " + _file, e);
LOGGER.log(Level.SEVERE, "Error loading file " + _file, e);
}
return doc;
}
@@ -344,7 +344,7 @@ public abstract class DocumentBase
}
if ((cond.conditions == null) || (cond.conditions.length == 0))
{
_log.severe("Empty <and> condition in " + _file);
LOGGER.severe("Empty <and> condition in " + _file);
}
return cond;
}
@@ -361,7 +361,7 @@ public abstract class DocumentBase
}
if ((cond.conditions == null) || (cond.conditions.length == 0))
{
_log.severe("Empty <or> condition in " + _file);
LOGGER.severe("Empty <or> condition in " + _file);
}
return cond;
}
@@ -375,7 +375,7 @@ public abstract class DocumentBase
return new ConditionLogicNot(parseCondition(n, template));
}
}
_log.severe("Empty <not> condition in " + _file);
LOGGER.severe("Empty <not> condition in " + _file);
return null;
}
@@ -900,7 +900,7 @@ public abstract class DocumentBase
if (cond == null)
{
_log.severe("Unrecognized <player> condition in " + _file);
LOGGER.severe("Unrecognized <player> condition in " + _file);
}
return cond;
}
@@ -1095,7 +1095,7 @@ public abstract class DocumentBase
if (cond == null)
{
_log.severe("Unrecognized <target> condition in " + _file);
LOGGER.severe("Unrecognized <target> condition in " + _file);
}
return cond;
}
@@ -1135,7 +1135,7 @@ public abstract class DocumentBase
if (old == mask)
{
_log.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item);
LOGGER.info("[parseUsingCondition=\"kind\"] Unknown item type name: " + item);
}
}
cond = joinAnd(cond, new ConditionUsingItemType(mask));
@@ -1156,7 +1156,7 @@ public abstract class DocumentBase
if (old == mask)
{
_log.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item);
LOGGER.info("[parseUsingCondition=\"slot\"] Unknown item slot name: " + item);
}
}
cond = joinAnd(cond, new ConditionUsingSlotType(mask));
@@ -1192,7 +1192,7 @@ public abstract class DocumentBase
if (cond == null)
{
_log.severe("Unrecognized <using> condition in " + _file);
LOGGER.severe("Unrecognized <using> condition in " + _file);
}
return cond;
}
@@ -1222,7 +1222,7 @@ public abstract class DocumentBase
}
if (cond == null)
{
_log.severe("Unrecognized <game> condition in " + _file);
LOGGER.severe("Unrecognized <game> condition in " + _file);
}
return cond;
}

View File

@@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -43,6 +44,8 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
*/
public final class DocumentItem extends DocumentBase implements IGameXmlReader
{
Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
private Item _currentItem = null;
private final List<L2Item> _itemsInFile = new LinkedList<>();
@@ -92,7 +95,7 @@ public final class DocumentItem extends DocumentBase implements IGameXmlReader
}
catch (Exception e)
{
_log.log(Level.WARNING, "Cannot create item " + _currentItem.id, e);
LOGGER.log(Level.WARNING, "Cannot create item " + _currentItem.id, e);
}
}
}

View File

@@ -52,7 +52,7 @@ import com.l2jmobius.gameserver.util.MathUtil;
*/
public class GeoEngine
{
protected static final Logger _log = Logger.getLogger(GeoEngine.class.getName());
protected static final Logger LOGGER = Logger.getLogger(GeoEngine.class.getName());
private final ABlock[][] _blocks;
private final BlockNull _nullBlock;
@@ -71,7 +71,7 @@ public class GeoEngine
*/
public GeoEngine()
{
_log.info("GeoEngine: Initializing...");
LOGGER.info("GeoEngine: Initializing...");
// initialize block container
_blocks = new ABlock[GeoStructure.GEO_BLOCKS_X][GeoStructure.GEO_BLOCKS_Y];
@@ -105,7 +105,7 @@ public class GeoEngine
}
}
_log.info("GeoEngine: Loaded " + loaded + " geodata files.");
LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
// avoid wrong configs when no files are loaded
if (loaded == 0)
@@ -113,12 +113,12 @@ public class GeoEngine
if (Config.PATHFINDING)
{
Config.PATHFINDING = false;
_log.info("GeoEngine: Forcing PathFinding setting to false.");
LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
}
if (Config.COORD_SYNCHRONIZE == 2)
{
Config.COORD_SYNCHRONIZE = -1;
_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
}
}
@@ -185,7 +185,7 @@ public class GeoEngine
// check data consistency
if (buffer.remaining() > 0)
{
_log.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read.");
LOGGER.warning("GeoEngine: Region file " + filename + " can be corrupted, remaining " + buffer.remaining() + " bytes to read.");
}
// loading was successful
@@ -194,8 +194,8 @@ public class GeoEngine
catch (Exception e)
{
// an error occured while loading, load null blocks
_log.warning("GeoEngine: Error while loading " + filename + " region file.");
_log.warning(e.getMessage());
LOGGER.warning("GeoEngine: Error while loading " + filename + " region file.");
LOGGER.warning(e.getMessage());
e.printStackTrace();
// replace whole region file with null blocks
@@ -300,7 +300,7 @@ public class GeoEngine
if (block == null) // null block check
{
// TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.)
// _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + ".");
// LOGGER.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + ".");
return false;
}
return block.hasGeoPos();

View File

@@ -57,11 +57,11 @@ final class GeoEnginePathfinding extends GeoEngine
}
catch (Exception e)
{
_log.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf);
LOGGER.warning("GeoEnginePathfinding: Can not load buffer setting: " + buf);
}
}
_log.info("GeoEnginePathfinding: Loaded " + count + " node buffers.");
LOGGER.info("GeoEnginePathfinding: Loaded " + count + " node buffers.");
}
@Override
@@ -109,7 +109,7 @@ final class GeoEnginePathfinding extends GeoEngine
}
catch (Exception e)
{
_log.warning(e.getMessage());
LOGGER.warning(e.getMessage());
return null;
}
finally

View File

@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public interface IActionHandler
{
Logger _log = Logger.getLogger(IActionHandler.class.getName());
Logger LOGGER = Logger.getLogger(IActionHandler.class.getName());
boolean action(L2PcInstance activeChar, L2Object target, boolean interact);

View File

@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public interface IActionShiftHandler
{
Logger _log = Logger.getLogger(IActionShiftHandler.class.getName());
Logger LOGGER = Logger.getLogger(IActionShiftHandler.class.getName());
boolean action(L2PcInstance activeChar, L2Object target, boolean interact);

View File

@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
*/
public interface IBypassHandler
{
Logger _log = Logger.getLogger(IBypassHandler.class.getName());
Logger LOGGER = Logger.getLogger(IBypassHandler.class.getName());
/**
* This is the worker method that is called when someone uses an bypass command.

View File

@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
*/
public interface IItemHandler
{
Logger _log = Logger.getLogger(IItemHandler.class.getName());
Logger LOGGER = Logger.getLogger(IItemHandler.class.getName());
/**
* Launch task associated to the item.

View File

@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentType;
*/
public interface IPunishmentHandler
{
Logger _log = Logger.getLogger(IPunishmentHandler.class.getName());
Logger LOGGER = Logger.getLogger(IPunishmentHandler.class.getName());
void onStart(PunishmentTask task);

View File

@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public interface IUserCommandHandler
{
Logger _log = Logger.getLogger(IUserCommandHandler.class.getName());
Logger LOGGER = Logger.getLogger(IUserCommandHandler.class.getName());
/**
* this is the worker method that is called when someone uses an admin command.

View File

@@ -60,7 +60,7 @@ import com.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
*/
public final class CommissionManager
{
private static final Logger _log = Logger.getLogger(CommissionManager.class.getName());
private static final Logger LOGGER = Logger.getLogger(CommissionManager.class.getName());
private static final int INTERACTION_DISTANCE = 250;
private static final int ITEMS_LIMIT_PER_REQUEST = 999;
@@ -103,7 +103,7 @@ public final class CommissionManager
final L2ItemInstance itemInstance = itemInstances.get(rs.getInt("item_object_id"));
if (itemInstance == null)
{
_log.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load.");
LOGGER.warning(getClass().getSimpleName() + ": Failed loading commission item with commission id " + commissionId + " because item instance does not exist or failed to load.");
continue;
}
final CommissionItem commissionItem = new CommissionItem(commissionId, itemInstance, rs.getLong("price_per_unit"), rs.getTimestamp("start_time").toInstant(), rs.getByte("duration_in_days"));
@@ -121,7 +121,7 @@ public final class CommissionManager
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading commission items.", e);
}
}
@@ -270,7 +270,7 @@ public final class CommissionManager
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed inserting commission item. ItemInstance: " + itemInstance, e);
player.sendPacket(SystemMessageId.THE_ITEM_HAS_FAILED_TO_BE_REGISTERED);
player.sendPacket(ExResponseCommissionRegister.FAILED);
}
@@ -409,7 +409,7 @@ public final class CommissionManager
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed deleting commission item. Commission ID: " + commissionId, e);
}
return false;
}

View File

@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
*/
public class FactionManager
{
private static Logger _log = Logger.getLogger(FactionManager.class.getName());
private static Logger LOGGER = Logger.getLogger(FactionManager.class.getName());
private final Map<Integer, Integer> _playerFactions = new ConcurrentHashMap<>();
protected FactionManager()
@@ -57,9 +57,9 @@ public class FactionManager
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load character faction information: " + e.getMessage(), e);
}
_log.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values.");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _playerFactions.size() + " character faction values.");
}
public final int getFactionByCharId(int id)
@@ -91,7 +91,7 @@ public class FactionManager
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char id: " + e.getMessage(), e);
}
return 0; // not found

View File

@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.entity.Fort;
public final class FortManager implements InstanceListManager
{
protected static final Logger _log = Logger.getLogger(FortManager.class.getName());
protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
private final Map<Integer, Fort> _forts = new ConcurrentSkipListMap<>();
@@ -131,7 +131,7 @@ public final class FortManager implements InstanceListManager
_forts.put(fortId, new Fort(fortId));
}
_log.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress");
LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress");
for (Fort fort : getForts())
{
fort.getSiege().loadSiegeGuard();
@@ -139,7 +139,7 @@ public final class FortManager implements InstanceListManager
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e);
}
}

View File

@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public final class FortSiegeManager
{
private static final Logger _log = Logger.getLogger(FortSiegeManager.class.getName());
private static final Logger LOGGER = Logger.getLogger(FortSiegeManager.class.getName());
private int _attackerMaxClans = 500; // Max number of clans
@@ -101,7 +101,7 @@ public final class FortSiegeManager
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Exception: checkIsRegistered(): " + e.getMessage(), e);
}
return register;
}
@@ -122,7 +122,7 @@ public final class FortSiegeManager
}
catch (Exception e)
{
_log.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e);
LOGGER.log(Level.WARNING, "Error while loading Fort Siege Manager settings!", e);
}
// Siege setting
@@ -163,7 +163,7 @@ public final class FortSiegeManager
}
catch (Exception e)
{
_log.warning("Error while loading commander(s) for " + fort.getName() + " fort.");
LOGGER.warning("Error while loading commander(s) for " + fort.getName() + " fort.");
}
}
@@ -189,7 +189,7 @@ public final class FortSiegeManager
}
catch (Exception e)
{
_log.warning("Error while loading flag(s) for " + fort.getName() + " fort.");
LOGGER.warning("Error while loading flag(s) for " + fort.getName() + " fort.");
}
}
_flagList.put(fort.getResidenceId(), _flagSpawns);

View File

@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.quest.Quest;
public final class GraciaSeedsManager
{
private static final Logger _log = Logger.getLogger(GraciaSeedsManager.class.getName());
private static final Logger LOGGER = Logger.getLogger(GraciaSeedsManager.class.getName());
public static String ENERGY_SEEDS = "EnergySeeds";
@@ -70,7 +70,7 @@ public final class GraciaSeedsManager
}
default:
{
_log.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType);
LOGGER.warning(getClass().getSimpleName() + ": Unknown SeedType in SaveData: " + seedType);
break;
}
}
@@ -124,7 +124,7 @@ public final class GraciaSeedsManager
}
default:
{
_log.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! ");
LOGGER.warning(getClass().getSimpleName() + ": Unknown Seed of Destruction state(" + _SoDState + ")! ");
}
}
}
@@ -134,7 +134,7 @@ public final class GraciaSeedsManager
final Quest quest = QuestManager.getInstance().getQuest(ENERGY_SEEDS);
if (quest == null)
{
_log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!");
LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!");
}
else
{
@@ -155,7 +155,7 @@ public final class GraciaSeedsManager
final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS);
if (esQuest == null)
{
_log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!");
LOGGER.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!");
}
else
{
@@ -171,7 +171,7 @@ public final class GraciaSeedsManager
public void setSoDState(int value, boolean doSave)
{
_log.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + ".");
LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + ".");
_SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis());
_SoDState = value;
// reset number of Tiat kills

View File

@@ -47,7 +47,7 @@ public final class GrandBossManager implements IStorable
private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?";
private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?";
protected static Logger _log = Logger.getLogger(GrandBossManager.class.getName());
protected static Logger LOGGER = Logger.getLogger(GrandBossManager.class.getName());
protected static Map<Integer, L2GrandBossInstance> _bosses = new ConcurrentHashMap<>();
@@ -83,26 +83,26 @@ public final class GrandBossManager implements IStorable
final int status = rs.getInt("status");
_bossStatus.put(bossId, status);
_storedInfo.put(bossId, info);
_log.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status);
LOGGER.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status);
if (status > 0)
{
_log.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time")));
LOGGER.info(getClass().getSimpleName() + ": Next spawn date of " + NpcData.getInstance().getTemplate(bossId).getName() + " is " + new Date(info.getLong("respawn_time")));
}
}
else
{
_log.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId);
LOGGER.warning(getClass().getSimpleName() + ": Could not find GrandBoss NPC template for " + bossId);
}
}
_log.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances.");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _storedInfo.size() + " Instances.");
}
catch (SQLException e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not load grandboss_data table: " + e.getMessage(), e);
}
catch (Exception e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while initializing GrandBossManager: " + e.getMessage(), e);
}
ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
}
@@ -119,7 +119,7 @@ public final class GrandBossManager implements IStorable
public void setBossStatus(int bossId, int status)
{
_bossStatus.put(bossId, status);
_log.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status);
LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status);
updateDb(bossId, true);
}
@@ -198,7 +198,7 @@ public final class GrandBossManager implements IStorable
}
catch (SQLException e)
{
_log.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Couldn't store grandbosses to database: " + e.getMessage(), e);
return false;
}
return true;
@@ -246,7 +246,7 @@ public final class GrandBossManager implements IStorable
}
catch (SQLException e)
{
_log.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Couldn't update grandbosses to database:" + e.getMessage(), e);
}
}

View File

@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
*/
public final class ItemsOnGroundManager implements Runnable
{
private static final Logger _log = Logger.getLogger(ItemsOnGroundManager.class.getName());
private static final Logger LOGGER = Logger.getLogger(ItemsOnGroundManager.class.getName());
private final Set<L2ItemInstance> _items = ConcurrentHashMap.newKeySet();
@@ -88,7 +88,7 @@ public final class ItemsOnGroundManager implements Runnable
}
catch (Exception e)
{
_log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e);
LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while updating table ItemsOnGround " + e.getMessage(), e);
}
}
@@ -137,11 +137,11 @@ public final class ItemsOnGroundManager implements Runnable
}
}
}
_log.info(getClass().getSimpleName() + ": Loaded " + count + " items.");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + count + " items.");
}
catch (Exception e)
{
_log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e);
LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while loading ItemsOnGround " + e.getMessage(), e);
}
if (Config.EMPTY_DROPPED_ITEM_TABLE_AFTER_LOAD)
@@ -185,7 +185,7 @@ public final class ItemsOnGroundManager implements Runnable
}
catch (Exception e1)
{
_log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1);
LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while cleaning table ItemsOnGround " + e1.getMessage(), e1);
}
}
@@ -235,13 +235,13 @@ public final class ItemsOnGroundManager implements Runnable
}
catch (Exception e)
{
_log.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e);
LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error while inserting into table ItemsOnGround: " + e.getMessage(), e);
}
}
}
catch (SQLException e)
{
_log.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e);
LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": SQL error while storing items on ground: " + e.getMessage(), e);
}
}

View File

@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.variables.PlayerVariables;
*/
public class MentorManager
{
private static final Logger _log = Logger.getLogger(MentorManager.class.getName());
private static final Logger LOGGER = Logger.getLogger(MentorManager.class.getName());
private final Map<Integer, Map<Integer, L2Mentee>> _menteeData = new ConcurrentHashMap<>();
private final Map<Integer, L2Mentee> _mentors = new ConcurrentHashMap<>();
@@ -65,7 +65,7 @@ public class MentorManager
}
catch (Exception e)
{
_log.log(Level.WARNING, e.getMessage(), e);
LOGGER.log(Level.WARNING, e.getMessage(), e);
}
}
@@ -85,7 +85,7 @@ public class MentorManager
}
catch (Exception e)
{
_log.log(Level.WARNING, e.getMessage(), e);
LOGGER.log(Level.WARNING, e.getMessage(), e);
}
}
@@ -104,7 +104,7 @@ public class MentorManager
}
catch (Exception e)
{
_log.log(Level.WARNING, e.getMessage(), e);
LOGGER.log(Level.WARNING, e.getMessage(), e);
}
finally
{

View File

@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public final class PetitionManager
{
protected static final Logger _log = Logger.getLogger(PetitionManager.class.getName());
protected static final Logger LOGGER = Logger.getLogger(PetitionManager.class.getName());
private final Map<Integer, Petition> _pendingPetitions;
private final Map<Integer, Petition> _completedPetitions;
@@ -55,7 +55,7 @@ public final class PetitionManager
final int numPetitions = getPendingPetitionCount();
getCompletedPetitions().clear();
_log.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed.");
LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed.");
}
public void clearPendingPetitions()
@@ -63,7 +63,7 @@ public final class PetitionManager
final int numPetitions = getPendingPetitionCount();
getPendingPetitions().clear();
_log.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed.");
LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed.");
}
public boolean acceptPetition(L2PcInstance respondingAdmin, int petitionId)

View File

@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.Shutdown;
*/
public class ServerRestartManager
{
static final Logger _log = Logger.getLogger(ServerRestartManager.class.getName());
static final Logger LOGGER = Logger.getLogger(ServerRestartManager.class.getName());
private String nextRestartTime = "unknown";
@@ -72,12 +72,12 @@ public class ServerRestartManager
{
nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime());
ThreadPool.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000));
_log.info("Scheduled server restart at " + lastRestart.getTime() + ".");
LOGGER.info("Scheduled server restart at " + lastRestart.getTime() + ".");
}
}
catch (Exception e)
{
_log.info("The scheduled server restart config is not set properly, please correct it!");
LOGGER.info("The scheduled server restart config is not set properly, please correct it!");
}
}

View File

@@ -44,7 +44,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
public final class SiegeManager
{
private static final Logger _log = Logger.getLogger(SiegeManager.class.getName());
private static final Logger LOGGER = Logger.getLogger(SiegeManager.class.getName());
private final Map<Integer, List<TowerSpawn>> _controlTowers = new HashMap<>();
private final Map<Integer, List<TowerSpawn>> _flameTowers = new HashMap<>();
@@ -103,7 +103,7 @@ public final class SiegeManager
}
catch (Exception e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Exception: checkIsRegistered(): " + e.getMessage(), e);
}
return register;
}
@@ -152,7 +152,7 @@ public final class SiegeManager
}
catch (Exception e)
{
_log.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle.");
LOGGER.warning(getClass().getSimpleName() + ": Error while loading control tower(s) for " + castle.getName() + " castle.");
}
}
@@ -183,7 +183,7 @@ public final class SiegeManager
}
catch (Exception e)
{
_log.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle.");
LOGGER.warning(getClass().getSimpleName() + ": Error while loading flame tower(s) for " + castle.getName() + " castle.");
}
}
_controlTowers.put(castle.getResidenceId(), controlTowers);
@@ -289,7 +289,7 @@ public final class SiegeManager
}
catch (Exception e)
{
_log.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e);
LOGGER.log(Level.WARNING, "Exception: loadTrapUpgrade(): " + e.getMessage(), e);
}
}

View File

@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public final class MessageDeletionTask implements Runnable
{
private static final Logger _log = Logger.getLogger(MessageDeletionTask.class.getName());
private static final Logger LOGGER = Logger.getLogger(MessageDeletionTask.class.getName());
final int _msgId;
@@ -76,7 +76,7 @@ public final class MessageDeletionTask implements Runnable
}
catch (Exception e)
{
_log.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e);
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error returning items:" + e.getMessage(), e);
}
}
MailManager.getInstance().deleteMessageInDb(msg.getId());

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