diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-08-29 22:01:21 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-08-29 22:14:17 +0200 |
| commit | c1e4cfd07eee19069a15e9b82a308d8a914d5637 (patch) | |
| tree | 298aeb0ec24e74cb178218eadf406498e95549af /src/server/game/World | |
| parent | 8ce3635d39dbdd101ddf180a66c483162df99c04 (diff) | |
Core/Config: Restore ability to load additional config files for custom scripts
Diffstat (limited to 'src/server/game/World')
| -rw-r--r-- | src/server/game/World/World.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 2c62a365f65..144b8c9df6a 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -471,10 +471,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(); |
