aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2020-08-29 22:01:21 +0200
committerShauren <shauren.trinity@gmail.com>2022-02-04 13:05:06 +0100
commit7cd98cd7d2e5723abdad12aed19213cb5b619189 (patch)
treee76978b0253d864aa3217384bf410a1530dc14cd /src/server
parent2aaebc193c231878133b70e466bd564645db5e4e (diff)
Core/Config: Restore ability to load additional config files for custom scripts
(cherry picked from commit c1e4cfd07eee19069a15e9b82a308d8a914d5637)
Diffstat (limited to 'src/server')
-rw-r--r--src/server/game/World/World.cpp8
1 files changed, 5 insertions, 3 deletions
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();