Aftermerge corrections

MegaMek · Jan 8, 2023 · ddb1cf7 · ddb1cf7
1 parent 81692e4
commit ddb1cf7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java b/megamek/src/megamek/client/ui/swing/MiniReportDisplay.java
@@ -34,7 +34,9 @@
 import javax.swing.text.Document;
 import java.awt.*;
 import java.awt.event.*;
+import java.util.Comparator;
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * Shows reports, with an Okay JButton
@@ -192,7 +194,9 @@ private void updatePlayerChoice() {
         lastChoice = (lastChoice != null ? lastChoice : name);
         comboPlayer.removeAllItems();
         comboPlayer.setEnabled(true);
-        for (Player player  : currentClient.getGame().getPlayersVectorSorted()) {
+        List<Player> sortedPlayerList = currentClient.getGame().getPlayersList();
+        sortedPlayerList.sort(Comparator.comparingInt(Player::getId));
+        for (Player player : sortedPlayerList) {
             String playerDisplay = String.format("%-12s", player.getName());
             comboPlayer.addItem(playerDisplay);
         }

diff --git a/megamek/src/megamek/common/Game.java b/megamek/src/megamek/common/Game.java
@@ -58,10 +58,6 @@ public class Game extends AbstractGame implements Serializable {
      */
     public final Version version = MMConstants.VERSION;
 
-    private Vector<Player> players = new Vector<>();
-    private Hashtable<Integer, Player> playerIds = new Hashtable<>();
-    private Vector<Team> teams = new Vector<>();
-
     private GameOptions options = new GameOptions();
 
     private Board board = new Board();

diff --git a/megamek/src/megamek/common/Mech.java b/megamek/src/megamek/common/Mech.java
@@ -6549,4 +6549,4 @@ public boolean isIndustrialMek() {
     public boolean getsAutoExternalSearchlight() {
         return true;
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -6549,4 +6549,4 @@ public boolean isIndustrialMek() { @@
         public boolean getsAutoExternalSearchlight() {
             return true;
         }
-    }
+    }