Fix battle calc current player selection in history mode. (#11803)

This is a corrected version of the change done in #10759.
triplea-game · Jul 22, 2023 · 849f33f · 849f33f
1 parent 128dfce
commit 849f33f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/game-app/game-core/src/main/java/games/strategy/engine/history/History.java b/game-app/game-core/src/main/java/games/strategy/engine/history/History.java
@@ -179,9 +179,13 @@ public synchronized void removeAllHistoryAfterNode(final HistoryNode removeAfter
       if (node instanceof Step) {
         player = ((Step) node).getPlayerId();
       }
-      int nodeChangeIndex = getNextChange(node);
-      if (seekingEnabled && nodeChangeIndex > nextChangeIndex) {
-        break;
+      if (node.isLeaf()) {
+        // Don't do this logic on non-leaf nodes as getNextChange() will return
+        // the next change after this non-leaf, skipping all the child nodes.
+        int nodeChangeIndex = getNextChange(node);
+        if (seekingEnabled && nodeChangeIndex > nextChangeIndex) {
+          break;
+        }
       }
     }
     return player;