aftermerge fix

MegaMek · Jun 14, 2024 · 404691e · 404691e
1 parent 2b57885
commit 404691e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/StatusBarPhaseDisplay.java b/megamek/src/megamek/client/ui/swing/StatusBarPhaseDisplay.java
@@ -317,9 +317,9 @@ public String getRemainingPlayerWithTurns() {
         Game game = clientgui.getClient().getGame();
         List<String> nextPlayerNames = new ArrayList<>();
         int turnIndex = game.getTurnIndex();
-        List<GameTurn> gameTurns = game.getTurnVector();
+        List<GameTurn> gameTurns = game.getTurnsList();
         for (int i = turnIndex + 1; (i < gameTurns.size()) && (nextPlayerNames.size() < playerCountToShow); i++) {
-            nextPlayerNames.add(game.getPlayer(gameTurns.get(i).getPlayerNum()).getName());
+            nextPlayerNames.add(game.getPlayer(gameTurns.get(i).playerId()).getName());
         }
         if (!nextPlayerNames.isEmpty()) {
             String playerList = String.join(", ", nextPlayerNames);