From 55b53f44dc0ac682e0421a62e559e0dc9fd1c4e4 Mon Sep 17 00:00:00 2001 From: click Date: Sun, 1 Apr 2012 19:38:15 +0200 Subject: Core: Tell ScriptMgr to reload properly on .reload - thanks to codels for the patch --- src/server/game/World/World.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 1a9905edd12..953eafcd3da 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1200,7 +1200,9 @@ void World::LoadConfigSettings(bool reload) m_bool_configs[CONFIG_PDUMP_NO_PATHS] = ConfigMgr::GetBoolDefault("PlayerDump.DisallowPaths", true); m_bool_configs[CONFIG_PDUMP_NO_OVERWRITE] = ConfigMgr::GetBoolDefault("PlayerDump.DisallowOverwrite", true); - sScriptMgr->OnConfigLoad(reload); + // call ScriptMgr if we're reloading the configuration + if (reload) + sScriptMgr->OnConfigLoad(reload); } extern void LoadGameObjectModelList(); @@ -1653,6 +1655,7 @@ void World::SetInitialWorldSettings() sLog->outString("Initializing Scripts..."); sScriptMgr->Initialize(); + sScriptMgr->OnConfigLoad(false); // must be done after the ScriptMgr has been properly initialized sLog->outString("Validating spell scripts..."); sObjectMgr->ValidateSpellScripts(); -- cgit v1.2.3