From 529470c1e79a5cf2fe24e09a95103e8a7b8fb352 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 17 Feb 2018 10:30:51 +0000 Subject: [PATCH] Use proper load method for InstanceManager. --- .../java/com/l2jmobius/gameserver/GameServer.java | 2 +- .../l2jmobius/gameserver/instancemanager/InstanceManager.java | 1 + .../java/com/l2jmobius/gameserver/GameServer.java | 2 +- .../l2jmobius/gameserver/instancemanager/InstanceManager.java | 1 + .../java/com/l2jmobius/gameserver/GameServer.java | 2 +- .../l2jmobius/gameserver/instancemanager/InstanceManager.java | 1 + .../java/com/l2jmobius/gameserver/GameServer.java | 2 +- .../l2jmobius/gameserver/instancemanager/InstanceManager.java | 1 + .../java/com/l2jmobius/gameserver/GameServer.java | 2 +- .../l2jmobius/gameserver/instancemanager/InstanceManager.java | 1 + 10 files changed, 10 insertions(+), 5 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java index 4f5a8d3df0..cb28a8a90c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java @@ -295,7 +295,7 @@ public class GameServer CommissionManager.getInstance(); printSection("Instance"); - InstanceManager.getInstance().load(); + InstanceManager.getInstance(); printSection("Olympiad"); Olympiad.getInstance(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index 3149d5ff45..0939f2cf18 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -79,6 +79,7 @@ public final class InstanceManager implements IGameXmlReader protected InstanceManager() { + load(); } // -------------------------------------------------------------------- diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameServer.java index 2c63d00fbd..c96b961ea1 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameServer.java @@ -301,7 +301,7 @@ public class GameServer CommissionManager.getInstance(); printSection("Instance"); - InstanceManager.getInstance().load(); + InstanceManager.getInstance(); printSection("Olympiad"); Olympiad.getInstance(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index 3149d5ff45..0939f2cf18 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -79,6 +79,7 @@ public final class InstanceManager implements IGameXmlReader protected InstanceManager() { + load(); } // -------------------------------------------------------------------- diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameServer.java index 1031bb9d19..bfb400c0d7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameServer.java @@ -301,7 +301,7 @@ public class GameServer CommissionManager.getInstance(); printSection("Instance"); - InstanceManager.getInstance().load(); + InstanceManager.getInstance(); printSection("Olympiad"); Olympiad.getInstance(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index 3149d5ff45..0939f2cf18 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -79,6 +79,7 @@ public final class InstanceManager implements IGameXmlReader protected InstanceManager() { + load(); } // -------------------------------------------------------------------- diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameServer.java index ca0e769a23..23073933fa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameServer.java @@ -301,7 +301,7 @@ public class GameServer CommissionManager.getInstance(); printSection("Instance"); - InstanceManager.getInstance().load(); + InstanceManager.getInstance(); printSection("Olympiad"); Olympiad.getInstance(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index 3149d5ff45..0939f2cf18 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -79,6 +79,7 @@ public final class InstanceManager implements IGameXmlReader protected InstanceManager() { + load(); } // -------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameServer.java index 9506e13651..2fd569ecdd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameServer.java @@ -299,7 +299,7 @@ public class GameServer CommissionManager.getInstance(); printSection("Instance"); - InstanceManager.getInstance().load(); + InstanceManager.getInstance(); printSection("Olympiad"); Olympiad.getInstance(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index 3149d5ff45..0939f2cf18 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -79,6 +79,7 @@ public final class InstanceManager implements IGameXmlReader protected InstanceManager() { + load(); } // --------------------------------------------------------------------