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 2c5fa70e49..800498d80b 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 @@ -73,6 +73,7 @@ import com.l2jmobius.gameserver.data.xml.impl.MultisellData; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.data.xml.impl.OptionData; import com.l2jmobius.gameserver.data.xml.impl.PetDataTable; +import com.l2jmobius.gameserver.data.xml.impl.PetSkillData; import com.l2jmobius.gameserver.data.xml.impl.PlayerTemplateData; import com.l2jmobius.gameserver.data.xml.impl.PlayerXpPercentLostData; import com.l2jmobius.gameserver.data.xml.impl.PrimeShopData; @@ -87,7 +88,6 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillLearnData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.data.xml.impl.SpawnsData; import com.l2jmobius.gameserver.data.xml.impl.StaticObjectData; -import com.l2jmobius.gameserver.data.xml.impl.PetSkillData; import com.l2jmobius.gameserver.data.xml.impl.TeleportersData; import com.l2jmobius.gameserver.data.xml.impl.TransformData; import com.l2jmobius.gameserver.data.xml.impl.UIData; @@ -295,7 +295,7 @@ public class GameServer CommissionManager.getInstance(); printSection("Instance"); - InstanceManager.getInstance(); + InstanceManager.getInstance().load(); 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 a8b7065ef7..c776c03a97 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,7 +79,6 @@ 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 9d5d1057ba..458761c5ae 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 @@ -75,6 +75,7 @@ import com.l2jmobius.gameserver.data.xml.impl.MultisellData; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.data.xml.impl.OptionData; import com.l2jmobius.gameserver.data.xml.impl.PetDataTable; +import com.l2jmobius.gameserver.data.xml.impl.PetSkillData; import com.l2jmobius.gameserver.data.xml.impl.PlayerTemplateData; import com.l2jmobius.gameserver.data.xml.impl.PlayerXpPercentLostData; import com.l2jmobius.gameserver.data.xml.impl.PrimeShopData; @@ -89,7 +90,6 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillLearnData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.data.xml.impl.SpawnsData; import com.l2jmobius.gameserver.data.xml.impl.StaticObjectData; -import com.l2jmobius.gameserver.data.xml.impl.PetSkillData; import com.l2jmobius.gameserver.data.xml.impl.TeleportersData; import com.l2jmobius.gameserver.data.xml.impl.TransformData; import com.l2jmobius.gameserver.data.xml.impl.UIData; @@ -301,7 +301,7 @@ public class GameServer CommissionManager.getInstance(); printSection("Instance"); - InstanceManager.getInstance(); + InstanceManager.getInstance().load(); 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 a8b7065ef7..c776c03a97 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,7 +79,6 @@ 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 019286d2d8..f254bb3edc 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 @@ -75,6 +75,7 @@ import com.l2jmobius.gameserver.data.xml.impl.MultisellData; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.data.xml.impl.OptionData; import com.l2jmobius.gameserver.data.xml.impl.PetDataTable; +import com.l2jmobius.gameserver.data.xml.impl.PetSkillData; import com.l2jmobius.gameserver.data.xml.impl.PlayerTemplateData; import com.l2jmobius.gameserver.data.xml.impl.PlayerXpPercentLostData; import com.l2jmobius.gameserver.data.xml.impl.PrimeShopData; @@ -89,7 +90,6 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillLearnData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.data.xml.impl.SpawnsData; import com.l2jmobius.gameserver.data.xml.impl.StaticObjectData; -import com.l2jmobius.gameserver.data.xml.impl.PetSkillData; import com.l2jmobius.gameserver.data.xml.impl.TeleportersData; import com.l2jmobius.gameserver.data.xml.impl.TransformData; import com.l2jmobius.gameserver.data.xml.impl.UIData; @@ -301,7 +301,7 @@ public class GameServer CommissionManager.getInstance(); printSection("Instance"); - InstanceManager.getInstance(); + InstanceManager.getInstance().load(); 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 a8b7065ef7..c776c03a97 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,7 +79,6 @@ 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 9b03b956e9..4ca346dac5 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 @@ -76,6 +76,7 @@ import com.l2jmobius.gameserver.data.xml.impl.MultisellData; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.data.xml.impl.OptionData; import com.l2jmobius.gameserver.data.xml.impl.PetDataTable; +import com.l2jmobius.gameserver.data.xml.impl.PetSkillData; import com.l2jmobius.gameserver.data.xml.impl.PlayerTemplateData; import com.l2jmobius.gameserver.data.xml.impl.PlayerXpPercentLostData; import com.l2jmobius.gameserver.data.xml.impl.PrimeShopData; @@ -90,7 +91,6 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillLearnData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.data.xml.impl.SpawnsData; import com.l2jmobius.gameserver.data.xml.impl.StaticObjectData; -import com.l2jmobius.gameserver.data.xml.impl.PetSkillData; import com.l2jmobius.gameserver.data.xml.impl.TeleportersData; import com.l2jmobius.gameserver.data.xml.impl.TransformData; import com.l2jmobius.gameserver.data.xml.impl.UIData; @@ -303,7 +303,7 @@ public class GameServer CommissionManager.getInstance(); printSection("Instance"); - InstanceManager.getInstance(); + InstanceManager.getInstance().load(); 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 a8b7065ef7..c776c03a97 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,7 +79,6 @@ 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 c48a442f20..c740336ab2 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 @@ -75,6 +75,7 @@ import com.l2jmobius.gameserver.data.xml.impl.MultisellData; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.data.xml.impl.OptionData; import com.l2jmobius.gameserver.data.xml.impl.PetDataTable; +import com.l2jmobius.gameserver.data.xml.impl.PetSkillData; import com.l2jmobius.gameserver.data.xml.impl.PlayerTemplateData; import com.l2jmobius.gameserver.data.xml.impl.PlayerXpPercentLostData; import com.l2jmobius.gameserver.data.xml.impl.PrimeShopData; @@ -89,7 +90,6 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillLearnData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.data.xml.impl.SpawnsData; import com.l2jmobius.gameserver.data.xml.impl.StaticObjectData; -import com.l2jmobius.gameserver.data.xml.impl.PetSkillData; import com.l2jmobius.gameserver.data.xml.impl.TeleportersData; import com.l2jmobius.gameserver.data.xml.impl.TransformData; import com.l2jmobius.gameserver.data.xml.impl.UIData; @@ -299,7 +299,7 @@ public class GameServer CommissionManager.getInstance(); printSection("Instance"); - InstanceManager.getInstance(); + InstanceManager.getInstance().load(); 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 a8b7065ef7..c776c03a97 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,7 +79,6 @@ public final class InstanceManager implements IGameXmlReader protected InstanceManager() { - load(); } // --------------------------------------------------------------------