From cb08c02537feb0d9c15eb9be46055b1ae532d12d Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sat, 15 Oct 2022 22:26:12 -0500 Subject: [PATCH] [Hotfix] Fix path load ordering for CLI commands --- world/main.cpp | 4 ++-- world/world_boot.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/world/main.cpp b/world/main.cpp index a919d41ed..523d98f3e 100644 --- a/world/main.cpp +++ b/world/main.cpp @@ -141,12 +141,12 @@ int main(int argc, char **argv) LogSys.LoadLogSettingsDefaults(); set_exception_handler(); - path.LoadPaths(); - if (WorldBoot::HandleCommandInput(argc, argv)) { return 0; } + path.LoadPaths(); + if (!WorldBoot::LoadServerConfig()) { return 0; } diff --git a/world/world_boot.cpp b/world/world_boot.cpp index a6df2ead1..2cfeee6ba 100644 --- a/world/world_boot.cpp +++ b/world/world_boot.cpp @@ -90,6 +90,7 @@ bool WorldBoot::HandleCommandInput(int argc, char **argv) // command handler if (argc > 1) { LogSys.SilenceConsoleLogging(); + path.LoadPaths(); WorldConfig::LoadConfig(); LoadDatabaseConnections(); LogSys.EnableConsoleLogging();