diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerTable.java index 73110fb6dc..fedd9d901f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerTable.java @@ -65,10 +65,10 @@ public final class GameServerTable implements IGameXmlReader load(); loadRegisteredGameServers(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); + LOGGER.info("Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); initRSAKeys(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Cached " + _keyPairs.length + " RSA keys for Game Server communication."); + LOGGER.info("Cached " + _keyPairs.length + " RSA keys for Game Server communication."); } @Override @@ -76,7 +76,7 @@ public final class GameServerTable implements IGameXmlReader { SERVER_NAMES.clear(); parseDatapackFile("data/servername.xml"); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + SERVER_NAMES.size() + " server names."); + LOGGER.info("Loaded " + SERVER_NAMES.size() + " server names."); } @Override @@ -106,7 +106,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading RSA keys for Game Server communication!"); + LOGGER.severe("Error loading RSA keys for Game Server communication!"); } } @@ -128,7 +128,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading registered game servers!"); + LOGGER.severe("Error loading registered game servers!"); } } @@ -232,7 +232,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error while saving gameserver!"); + LOGGER.severe("Error while saving gameserver!"); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerTable.java index 73110fb6dc..fedd9d901f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerTable.java @@ -65,10 +65,10 @@ public final class GameServerTable implements IGameXmlReader load(); loadRegisteredGameServers(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); + LOGGER.info("Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); initRSAKeys(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Cached " + _keyPairs.length + " RSA keys for Game Server communication."); + LOGGER.info("Cached " + _keyPairs.length + " RSA keys for Game Server communication."); } @Override @@ -76,7 +76,7 @@ public final class GameServerTable implements IGameXmlReader { SERVER_NAMES.clear(); parseDatapackFile("data/servername.xml"); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + SERVER_NAMES.size() + " server names."); + LOGGER.info("Loaded " + SERVER_NAMES.size() + " server names."); } @Override @@ -106,7 +106,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading RSA keys for Game Server communication!"); + LOGGER.severe("Error loading RSA keys for Game Server communication!"); } } @@ -128,7 +128,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading registered game servers!"); + LOGGER.severe("Error loading registered game servers!"); } } @@ -232,7 +232,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error while saving gameserver!"); + LOGGER.severe("Error while saving gameserver!"); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerTable.java index 73110fb6dc..fedd9d901f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerTable.java @@ -65,10 +65,10 @@ public final class GameServerTable implements IGameXmlReader load(); loadRegisteredGameServers(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); + LOGGER.info("Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); initRSAKeys(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Cached " + _keyPairs.length + " RSA keys for Game Server communication."); + LOGGER.info("Cached " + _keyPairs.length + " RSA keys for Game Server communication."); } @Override @@ -76,7 +76,7 @@ public final class GameServerTable implements IGameXmlReader { SERVER_NAMES.clear(); parseDatapackFile("data/servername.xml"); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + SERVER_NAMES.size() + " server names."); + LOGGER.info("Loaded " + SERVER_NAMES.size() + " server names."); } @Override @@ -106,7 +106,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading RSA keys for Game Server communication!"); + LOGGER.severe("Error loading RSA keys for Game Server communication!"); } } @@ -128,7 +128,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading registered game servers!"); + LOGGER.severe("Error loading registered game servers!"); } } @@ -232,7 +232,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error while saving gameserver!"); + LOGGER.severe("Error while saving gameserver!"); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerTable.java index 73110fb6dc..fedd9d901f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerTable.java @@ -65,10 +65,10 @@ public final class GameServerTable implements IGameXmlReader load(); loadRegisteredGameServers(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); + LOGGER.info("Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); initRSAKeys(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Cached " + _keyPairs.length + " RSA keys for Game Server communication."); + LOGGER.info("Cached " + _keyPairs.length + " RSA keys for Game Server communication."); } @Override @@ -76,7 +76,7 @@ public final class GameServerTable implements IGameXmlReader { SERVER_NAMES.clear(); parseDatapackFile("data/servername.xml"); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + SERVER_NAMES.size() + " server names."); + LOGGER.info("Loaded " + SERVER_NAMES.size() + " server names."); } @Override @@ -106,7 +106,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading RSA keys for Game Server communication!"); + LOGGER.severe("Error loading RSA keys for Game Server communication!"); } } @@ -128,7 +128,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading registered game servers!"); + LOGGER.severe("Error loading registered game servers!"); } } @@ -232,7 +232,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error while saving gameserver!"); + LOGGER.severe("Error while saving gameserver!"); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg b/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg deleted file mode 100644 index 57ceab892f..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg +++ /dev/null @@ -1,9 +0,0 @@ -#Olympiad Properties -#Thu May 03 03:12:28 EEST 2018 -CurrentCycle=1 -NextWeeklyChange_DateFormat=10 \u039C\u03B1\u03CA 2018 3\:12\:12 \u03C0\u03BC -NextWeeklyChange=1525911132151 -OlympiadEnd=1527843600151 -OlympiadEnd_DateFormat=1 \u0399\u03BF\u03C5\u03BD 2018 12\:00\:00 \u03BC\u03BC -Period=0 -ValdationEnd=0 diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginController.java index 1f32bea531..a4639b926a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginController.java @@ -42,7 +42,6 @@ import com.l2jmobius.Config; import com.l2jmobius.commons.crypt.ScrambledKeyPair; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.commons.util.Util; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason; @@ -133,8 +132,6 @@ public class LoginController private LoginController() throws GeneralSecurityException { - Util.printSection("LoginController"); - _hackProtection = new HashMap<>(); _keyPairs = new ScrambledKeyPair[10]; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java index 9b4efaec2a..b65ec0928e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/LoginServer.java @@ -34,7 +34,6 @@ import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.mmocore.NetcoreConfig; import com.l2jmobius.commons.mmocore.SelectorConfig; import com.l2jmobius.commons.mmocore.SelectorThread; -import com.l2jmobius.commons.util.Util; import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; import com.l2jmobius.loginserver.ui.Gui; import com.l2jmobius.status.Status; @@ -88,7 +87,6 @@ public class LoginServer // Load LoginServer Configs Config.load(); - Util.printSection("Database"); // Prepare Database DatabaseFactory.getInstance(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java index 7d191232fe..c29ffc637e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java @@ -65,10 +65,10 @@ public final class GameServerTable implements IGameXmlReader load(); loadRegisteredGameServers(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); + LOGGER.info("Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); initRSAKeys(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Cached " + _keyPairs.length + " RSA keys for Game Server communication."); + LOGGER.info("Cached " + _keyPairs.length + " RSA keys for Game Server communication."); } @Override @@ -76,7 +76,7 @@ public final class GameServerTable implements IGameXmlReader { SERVER_NAMES.clear(); parseDatapackFile("data/servername.xml"); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + SERVER_NAMES.size() + " server names."); + LOGGER.info("Loaded " + SERVER_NAMES.size() + " server names."); } @Override @@ -106,7 +106,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading RSA keys for Game Server communication!"); + LOGGER.severe("Error loading RSA keys for Game Server communication!"); } } @@ -128,7 +128,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading registered game servers!"); + LOGGER.severe("Error loading registered game servers!"); } } @@ -232,7 +232,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error while saving gameserver!"); + LOGGER.severe("Error while saving gameserver!"); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerTable.java index 73110fb6dc..fedd9d901f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerTable.java @@ -65,10 +65,10 @@ public final class GameServerTable implements IGameXmlReader load(); loadRegisteredGameServers(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); + LOGGER.info("Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); initRSAKeys(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Cached " + _keyPairs.length + " RSA keys for Game Server communication."); + LOGGER.info("Cached " + _keyPairs.length + " RSA keys for Game Server communication."); } @Override @@ -76,7 +76,7 @@ public final class GameServerTable implements IGameXmlReader { SERVER_NAMES.clear(); parseDatapackFile("data/servername.xml"); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + SERVER_NAMES.size() + " server names."); + LOGGER.info("Loaded " + SERVER_NAMES.size() + " server names."); } @Override @@ -106,7 +106,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading RSA keys for Game Server communication!"); + LOGGER.severe("Error loading RSA keys for Game Server communication!"); } } @@ -128,7 +128,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading registered game servers!"); + LOGGER.severe("Error loading registered game servers!"); } } @@ -232,7 +232,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error while saving gameserver!"); + LOGGER.severe("Error while saving gameserver!"); } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerTable.java index 73110fb6dc..fedd9d901f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerTable.java @@ -65,10 +65,10 @@ public final class GameServerTable implements IGameXmlReader load(); loadRegisteredGameServers(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); + LOGGER.info("Loaded " + GAME_SERVER_TABLE.size() + " registered Game Servers."); initRSAKeys(); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Cached " + _keyPairs.length + " RSA keys for Game Server communication."); + LOGGER.info("Cached " + _keyPairs.length + " RSA keys for Game Server communication."); } @Override @@ -76,7 +76,7 @@ public final class GameServerTable implements IGameXmlReader { SERVER_NAMES.clear(); parseDatapackFile("data/servername.xml"); - LOGGER.info(GameServerTable.class.getSimpleName() + ": Loaded " + SERVER_NAMES.size() + " server names."); + LOGGER.info("Loaded " + SERVER_NAMES.size() + " server names."); } @Override @@ -106,7 +106,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading RSA keys for Game Server communication!"); + LOGGER.severe("Error loading RSA keys for Game Server communication!"); } } @@ -128,7 +128,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error loading registered game servers!"); + LOGGER.severe("Error loading registered game servers!"); } } @@ -232,7 +232,7 @@ public final class GameServerTable implements IGameXmlReader } catch (Exception e) { - LOGGER.severe(GameServerTable.class.getSimpleName() + ": Error while saving gameserver!"); + LOGGER.severe("Error while saving gameserver!"); } }