diff --git a/zone/main.cpp b/zone/main.cpp index 376b8a508..fe32fc0db 100644 --- a/zone/main.cpp +++ b/zone/main.cpp @@ -260,12 +260,6 @@ int main(int argc, char** argv) { guild_mgr.SetDatabase(&database); GuildBanks = nullptr; - /** - * NPC Scale Manager - */ - npc_scale_manager = new NpcScaleManager; - npc_scale_manager->LoadScaleData(); - #ifdef _EQDEBUG _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); #endif @@ -406,6 +400,12 @@ int main(int argc, char** argv) { LogError("Bot spell casting chances loading failed"); #endif + /** + * NPC Scale Manager + */ + npc_scale_manager = new NpcScaleManager; + npc_scale_manager->LoadScaleData(); + if (RuleB(TaskSystem, EnableTaskSystem)) { task_manager = new TaskManager; task_manager->LoadTasks(); @@ -588,6 +588,7 @@ int main(int argc, char** argv) { Zone::Shutdown(true); //Fix for Linux world server problem. safe_delete(task_manager); + safe_delete(npc_scale_manager); command_deinit(); #ifdef BOTS bot_command_deinit();