From 3347a84656a2b72dc21244484fdd34d7ba03ac56 Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Thu, 5 Feb 2026 23:18:22 -0800
Subject: [PATCH] Fix single-player position not loading on login

loadSinglePlayerCharacterState was updating the character struct but not
movementInfo, which startSinglePlayer uses for spawn position. Now sets
movementInfo.x/y/z/orientation from saved state.
---
 src/game/game_handler.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/game/game_handler.cpp b/src/game/game_handler.cpp
index eefbbec9..1fee33b1 100644
--- a/src/game/game_handler.cpp
+++ b/src/game/game_handler.cpp
@@ -1530,6 +1530,12 @@ bool GameHandler::loadSinglePlayerCharacterState(uint64_t guid) {
     spSavedOrientation_[guid] = orientation;
     if (!hasState) return false;
 
+    // Update movementInfo so startSinglePlayer can use it for spawning
+    movementInfo.x = posX;
+    movementInfo.y = posY;
+    movementInfo.z = posZ;
+    movementInfo.orientation = orientation;
+
     // Update character list entry
     for (auto& ch : characters) {
         if (ch.guid == guid) {