pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-18 03:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Hotfix] Fix path load ordering for CLI commands

Browse Source
This commit is contained in:
Akkadius 2022-10-15 22:26:12 -05:00
parent dea94ce63d
commit cb08c02537
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
world/main.cpp
View File

@ -141,12 +141,12 @@ int main(int argc, char **argv)
LogSys.LoadLogSettingsDefaults(); LogSys.LoadLogSettingsDefaults();
set_exception_handler(); set_exception_handler();
path.LoadPaths();
if (WorldBoot::HandleCommandInput(argc, argv)) { if (WorldBoot::HandleCommandInput(argc, argv)) {
return 0; return 0;
} }
path.LoadPaths();
if (!WorldBoot::LoadServerConfig()) { if (!WorldBoot::LoadServerConfig()) {
return 0; return 0;
} }

1
world/world_boot.cpp
View File

@ -90,6 +90,7 @@ bool WorldBoot::HandleCommandInput(int argc, char **argv)
// command handler // command handler
if (argc > 1) { if (argc > 1) {
LogSys.SilenceConsoleLogging(); LogSys.SilenceConsoleLogging();
path.LoadPaths();
WorldConfig::LoadConfig(); WorldConfig::LoadConfig();
LoadDatabaseConnections(); LoadDatabaseConnections();
LogSys.EnableConsoleLogging(); LogSys.EnableConsoleLogging();