From d60dd8338fc2373498ae666c5cf0215f096d9296 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 23 Aug 2019 16:35:50 +0000 Subject: [PATCH] Moved loading configs after creating log folders. --- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 14 +++++++------- .../org/l2jmobius/loginserver/LoginServer.java | 11 +++++++---- .../java/org/l2jmobius/gameserver/GameServer.java | 8 +++----- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- .../java/org/l2jmobius/gameserver/GameServer.java | 8 ++++---- .../org/l2jmobius/loginserver/LoginServer.java | 6 +++--- 30 files changed, 111 insertions(+), 110 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java index 11572d512c..61a351a512 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java @@ -184,11 +184,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -197,6 +194,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java index 3edde93307..74d88fb35c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java @@ -188,11 +188,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -201,6 +198,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java index 3edde93307..74d88fb35c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java @@ -188,11 +188,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -201,6 +198,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java index 4858f766cb..78f8b09f2b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java @@ -188,11 +188,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -201,6 +198,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java index 434389d2b5..dffac435fb 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java @@ -190,11 +190,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -203,6 +200,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java index 434389d2b5..dffac435fb 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java @@ -190,11 +190,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -203,6 +200,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java index c49ff6a161..6a486e16fd 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java @@ -191,11 +191,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -204,6 +201,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java index a4086507d3..a9452f17ac 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -153,6 +153,8 @@ public class GameServer public static void main(String[] args) throws Exception { + final long serverLoadStart = System.currentTimeMillis(); + // GUI if (!GraphicsEnvironment.isHeadless()) { @@ -160,11 +162,8 @@ public class GameServer new Gui(); } - // Load GameServer Configs - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -173,7 +172,8 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } - final long serverLoadStart = System.currentTimeMillis(); + // Initialize config + Config.load(ServerMode.GAME); Util.printSection("Database"); DatabaseFactory.init(); @@ -188,8 +188,8 @@ public class GameServer Util.printSection("IdFactory"); if (!IdFactory.getInstance().isInitialized()) { - LOGGER.info("Could not read object IDs from DB. Please Check Your Data."); - throw new Exception("Could not initialize the ID factory"); + LOGGER.severe("IdFactory: Could not read object IDs from database. Please check your configuration."); + throw new Exception("Could not initialize the ID factory!"); } new File(Config.DATAPACK_ROOT, "data/clans").mkdirs(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java index 870bc84403..20c5f3dea8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java @@ -38,6 +38,9 @@ import org.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; import org.l2jmobius.loginserver.ui.Gui; import org.l2jmobius.telnet.TelnetStatusThread; +/** + * @author KenM + */ public class LoginServer { public Logger LOGGER = Logger.getLogger(LoginServer.class.getName()); @@ -68,9 +71,6 @@ public class LoginServer new Gui(); } - // Load LoginServer Configs - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -86,6 +86,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); @@ -95,7 +98,7 @@ public class LoginServer } catch (GeneralSecurityException e) { - LOGGER.severe("Failed initializing LoginController " + e); + LOGGER.severe("FATAL: Failed initializing LoginController. Reason: " + e); System.exit(1); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java index 5610262ee9..b875d6dcb4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java @@ -182,11 +182,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -195,7 +192,8 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } - new File("log/game").mkdirs(); + // Initialize config + Config.load(ServerMode.GAME); printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java index 5ff1991350..fe7005083a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java index 4d766fe5f0..c1e3abbb2e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java @@ -185,11 +185,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -198,6 +195,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java index 4d766fe5f0..c1e3abbb2e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java @@ -185,11 +185,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -198,6 +195,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java index 4d766fe5f0..c1e3abbb2e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java @@ -185,11 +185,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -198,6 +195,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java index 023c41163f..46dac94586 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java @@ -186,11 +186,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -199,6 +196,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java index c89504d824..c23204e4fe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java @@ -187,11 +187,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -200,6 +197,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java index c89504d824..c23204e4fe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java @@ -187,11 +187,8 @@ public class GameServer new Gui(); } - // Initialize config - Config.load(ServerMode.GAME); - // Create log folder - final File logFolder = new File(Config.DATAPACK_ROOT, "log"); + final File logFolder = new File(".", "log"); logFolder.mkdir(); // Create input stream for log file -- or store file data into memory @@ -200,6 +197,9 @@ public class GameServer LogManager.getLogManager().readConfiguration(is); } + // Initialize config + Config.load(ServerMode.GAME); + printSection("Database"); DatabaseFactory.init(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java index e6f32f260e..7119d72ef6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java @@ -69,9 +69,6 @@ public class LoginServer new Gui(); } - // Load Config - Config.load(ServerMode.LOGIN); - // Create log folder final File logFolder = new File(".", "log"); logFolder.mkdir(); @@ -87,6 +84,9 @@ public class LoginServer LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); } + // Load Config + Config.load(ServerMode.LOGIN); + // Prepare Database DatabaseFactory.init();