diff --git a/src/engine/server/login/LoginServer.java b/src/engine/server/login/LoginServer.java index f4d559ef..2eb173e3 100644 --- a/src/engine/server/login/LoginServer.java +++ b/src/engine/server/login/LoginServer.java @@ -22,6 +22,7 @@ import engine.net.client.ClientConnectionManager; import engine.net.client.msg.login.*; import engine.objects.*; import engine.parsers.cache.DeedParser; +import engine.parsers.cache.ItemParser; import engine.parsers.cache.RuneParser; import engine.parsers.objects.DeedTemplate; import engine.parsers.objects.RuneTemplate; @@ -304,6 +305,15 @@ public class LoginServer { exit(1); } + // Qualified: engine.objects.ItemTemplate is the database-loaded class + Logger.info("Loading Cache Item Templates"); + engine.parsers.objects.ItemTemplate._items = ItemParser.parseItemFolder(); + + if (engine.parsers.objects.ItemTemplate._items == null || engine.parsers.objects.ItemTemplate._items.isEmpty()) { + Logger.error("ABORT! Cache item templates failed to load!"); + exit(1); + } + Logger.info("Initializing Network"); Network.init(); diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java index c618c01e..e5982a1c 100644 --- a/src/engine/server/world/WorldServer.java +++ b/src/engine/server/world/WorldServer.java @@ -32,6 +32,7 @@ import engine.net.client.msg.UpdateStateMsg; import engine.net.client.msg.chat.ChatSystemMsg; import engine.objects.*; import engine.parsers.cache.DeedParser; +import engine.parsers.cache.ItemParser; import engine.parsers.cache.RuneParser; import engine.parsers.objects.DeedTemplate; import engine.parsers.objects.RuneTemplate; @@ -323,6 +324,15 @@ public class WorldServer { exit(1); } + // Qualified: engine.objects.ItemTemplate is the database-loaded class + Logger.info("Loading Cache Item Templates"); + engine.parsers.objects.ItemTemplate._items = ItemParser.parseItemFolder(); + + if (engine.parsers.objects.ItemTemplate._items == null || engine.parsers.objects.ItemTemplate._items.isEmpty()) { + Logger.error("ABORT! Cache item templates failed to load!"); + exit(1); + } + Logger.info("Loading PromotionClasses"); DbManager.PromotionQueries.GET_ALL_PROMOTIONS();