From 2883160086e3e3ff92d04d6d20d0c27d218878fe Mon Sep 17 00:00:00 2001
From: Jelle Meeus <sogladev@gmail.com>
Date: Tue, 13 May 2025 21:03:42 +0200
Subject: [PATCH] =?UTF-8?q?fixup!=20refactor(Core/World):=20Move=20various?=
 =?UTF-8?q?=20worldstate=20related=20function=E2=80=A6=20(#22119)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/World/World.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 5a3871846..edccd7b66 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1755,7 +1755,6 @@ void World::SetInitialWorldSettings()
 
     LOG_INFO("server.loading", "Loading WorldStates...");              // must be loaded before battleground, outdoor PvP and conditions
     sWorldState->LoadWorldStates();
-    sWorldState->Load();
 
     LOG_INFO("server.loading", "Loading Conditions...");
     sConditionMgr->LoadConditions();
@@ -1880,6 +1879,9 @@ void World::SetInitialWorldSettings()
     uint32 nextGameEvent = sGameEventMgr->StartSystem();
     _timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);    //depend on next event
 
+    LOG_INFO("server.loading", "Loading WorldState...");
+    sWorldState->Load(); // must be called after loading game events
+
     // Delete all characters which have been deleted X days before
     Player::DeleteOldCharacters();