From 7cd98cd7d2e5723abdad12aed19213cb5b619189 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 29 Aug 2020 22:01:21 +0200
Subject: Core/Config: Restore ability to load additional config files for
 custom scripts

(cherry picked from commit c1e4cfd07eee19069a15e9b82a308d8a914d5637)
---
 src/server/game/World/World.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/server')

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 9e03fa5ad10..2383642b917 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -534,10 +534,12 @@ void World::LoadConfigSettings(bool reload)
 {
     if (reload)
     {
-        std::string configError;
-        if (!sConfigMgr->Reload(configError))
+        std::vector<std::string> configErrors;
+        if (!sConfigMgr->Reload(configErrors))
         {
-            TC_LOG_ERROR("misc", "World settings reload fail: %s.", configError.c_str());
+            for (std::string const& configError : configErrors)
+                TC_LOG_ERROR("misc", "World settings reload fail: %s.", configError.c_str());
+
             return;
         }
         sLog->LoadFromConfig();
-- 
cgit v1.2.3