Fix tests.

triplea-game · Jul 16, 2023 · 6fb5767 · 6fb5767
1 parent f57c9b0
commit 6fb5767
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/game-app/game-core/src/main/java/games/strategy/engine/data/GameData.java b/game-app/game-core/src/main/java/games/strategy/engine/data/GameData.java
@@ -395,6 +395,14 @@ private void fixUpNullPlayers() {
     }
   }
 
+  @RemoveOnNextMajorRelease
+  public void fixUpNullPlayersInDelegates() {
+    BattleDelegate battleDelegate = (BattleDelegate) getDelegate("battle");
+    if (battleDelegate != null) {
+      battleDelegate.getBattleTracker().fixUpNullPlayers(playerList.getNullPlayer());
+    }
+  }
+
   public interface Unlocker extends Closeable {
     @Override
     void close();

diff --git a/game-app/game-core/src/main/java/games/strategy/engine/framework/GameDataManager.java b/game-app/game-core/src/main/java/games/strategy/engine/framework/GameDataManager.java
@@ -74,9 +74,7 @@ public static Optional<GameData> loadGameUncompressed(final InputStream is) {
       final GameData data = (GameData) input.readObject();
       data.postDeSerialize();
       loadDelegates(input, data);
-      data.getBattleDelegate()
-          .getBattleTracker()
-          .fixUpNullPlayers(data.getPlayerList().getNullPlayer());
+      data.fixUpNullPlayersInDelegates();
       return Optional.of(data);
     } catch (final Throwable e) {
       log.warn(