From e61dbad1929d003f057920c01b5ebea0905bf6a9 Mon Sep 17 00:00:00 2001
From: Kargatum <dowlandtop@yandex.com>
Date: Sun, 12 Dec 2021 23:20:39 +0700
Subject: [PATCH] feat(Core/Config): loading modules configs before loading
 scripts (#9653)

---
 src/common/Configuration/Config.cpp | 2 +-
 src/common/Configuration/Config.h   | 2 +-
 src/server/worldserver/Main.cpp     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp
index e6cb945da..a37ebcfe4 100644
--- a/src/common/Configuration/Config.cpp
+++ b/src/common/Configuration/Config.cpp
@@ -360,7 +360,7 @@ std::string const ConfigMgr::GetConfigPath()
 #endif
 }
 
-void ConfigMgr::Configure(std::string const& initFileName, std::vector<std::string> args, std::string const& modulesConfigList /*= ""*/)
+void ConfigMgr::Configure(std::string const& initFileName, std::vector<std::string> args, std::string_view modulesConfigList /*= {}*/)
 {
     _filename = initFileName;
     _args = std::move(args);
diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h
index 9709a4f31..857e0f609 100644
--- a/src/common/Configuration/Config.h
+++ b/src/common/Configuration/Config.h
@@ -33,7 +33,7 @@ class ConfigMgr
 public:
     bool LoadAppConfigs(bool isReload = false);
     bool LoadModulesConfigs(bool isReload = false, bool isNeedPrintInfo = true);
-    void Configure(std::string const& initFileName, std::vector<std::string> args, std::string const& modulesConfigList = "");
+    void Configure(std::string const& initFileName, std::vector<std::string> args, std::string_view modulesConfigList = {});
 
     static ConfigMgr* instance();
 
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 2118d8b9c..d36235f65 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -274,6 +274,9 @@ int main(int argc, char** argv)
     // Set process priority according to configuration settings
     SetProcessPriority("server.worldserver", sConfigMgr->GetOption<int32>(CONFIG_PROCESSOR_AFFINITY, 0), sConfigMgr->GetOption<bool>(CONFIG_HIGH_PRIORITY, false));
 
+    // Loading modules configs before scripts
+    sConfigMgr->LoadModulesConfigs();
+
     sScriptMgr->SetScriptLoader(AddScripts);
     sScriptMgr->SetModulesLoader(AddModulesScripts);
 
@@ -315,9 +318,6 @@ int main(int argc, char** argv)
 
     Acore::Module::SetEnableModulesList(AC_MODULES_LIST);
 
-    // Loading modules configs before scripts
-    sConfigMgr->LoadModulesConfigs();
-
     ///- Initialize the World
     sSecretMgr->Initialize();
     sWorld->SetInitialWorldSettings();