diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index d1a82ee70..768616e40 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -456,6 +456,16 @@ void World::LoadConfigSettings(bool reload) } LoadModuleConfigSettings(); + +#ifdef ELUNA + ///- Initialize Lua Engine + if (!reload) + { + sLog->outString("Initialize Eluna Lua Engine..."); + Eluna::Initialize(); + } +#endif + sScriptMgr->OnBeforeConfigLoad(reload); // Reload log levels and filters @@ -1331,21 +1341,6 @@ void World::SetInitialWorldSettings() vmmgr2->GetLiquidFlagsPtr = &GetLiquidFlags; } -#ifdef ELUNA - ///- Initialize Lua Engine - sLog->outString("Initialize Eluna Lua Engine..."); - - std::string conf_path = _CONF_DIR; - std::string cfg_file = conf_path + "/mod_LuaEngine.conf"; -#ifdef WIN32 - cfg_file = "mod_LuaEngine.conf"; -#endif - std::string cfg_def_file = cfg_file + ".dist"; - sConfigMgr->LoadMore(cfg_def_file.c_str()); - sConfigMgr->LoadMore(cfg_file.c_str()); - Eluna::Initialize(); -#endif - ///- Initialize config settings LoadConfigSettings();