1

src/hooks/rpg-runtime-story/rpgRuntimeStoryGateway.ts

@@ -301,6 +301,13 @@ function bridgeServerNpcBattleSnapshot(params: {
       sceneHostileNpcs: resolvedBattleFormation,
       currentEncounter: null,
       npcInteractionActive: false,
+      // 中文注释：服务端兼容链路若未带回战前遭遇，则沿用进入战斗前的原始 encounter，
+      // 让后续 fight_victory / spar_complete 都能恢复到正确站位，而不是战斗中的临时坐标。
+      sparReturnEncounter:
+        snapshotState.sparReturnEncounter ??
+        (previousState.currentEncounter?.kind === 'npc'
+          ? previousState.currentEncounter
+          : null),
     },
   } satisfies HydratedSavedGameSnapshot;
 }