fix: added two null checks that were missing

MegaMek · Jan 20, 2025 · ce96d19 · ce96d19
1 parent 78a3c6e
commit ce96d19
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/megamek/i18n/megamek/common/messages.properties b/megamek/i18n/megamek/common/messages.properties
@@ -655,7 +655,7 @@ acar.jump_modifier=Movement modifier
 acar.withdraw.crippled=Crippled
 
 AutoResolveSimulationLogDialog.title=Auto Resolve Report
-
+AutoResolveSimulationLogDialog.noReport=Something went wrong and it was not possible to resolve the game
 
 ### AutoResolveDialog
 AutoResolveMethod.dialog.name=Auto Resolve Chance Dialog

diff --git a/megamek/src/megamek/client/ui/swing/lobby/ChatLounge.java b/megamek/src/megamek/client/ui/swing/lobby/ChatLounge.java
@@ -1931,10 +1931,14 @@ public void actionPerformed(ActionEvent ev) {
                 }
 
                 var event = AutoResolveProgressDialog.showDialog(clientgui.getFrame(), forcesSetups, board);
-
-                var autoResolveBattleReport = new AutoResolveSimulationLogDialog(clientgui.getFrame(), event.getLogFile());
-                autoResolveBattleReport.setModal(true);
-                autoResolveBattleReport.setVisible(true);
+                if (event != null) {
+                    var autoResolveBattleReport = new AutoResolveSimulationLogDialog(clientgui.getFrame(), event.getLogFile());
+                    autoResolveBattleReport.setModal(true);
+                    autoResolveBattleReport.setVisible(true);
+                } else {
+                    clientgui.doAlertDialog(Messages.getString("AutoResolveSimulationLogDialog.title"),
+                            Messages.getString("AutoResolveSimulationLogDialog.noReport"));
+                }
 
             } else if (ev.getSource() == butDetach) {
                 butDetach.setEnabled(false);

diff --git a/megamek/src/megamek/server/totalwarfare/TWGameManager.java b/megamek/src/megamek/server/totalwarfare/TWGameManager.java
@@ -546,6 +546,7 @@ public void removeAllEntitiesOwnedBy(Player player) {
         game.getEntitiesVector().stream()
                 .filter(e -> e.getOwnerId() != pid)
                 .filter(Entity::partOfForce)
+                .filter(e -> forces.getForce(e.getForceId()) != null)
                 .filter(e -> forces.getForce(e.getForceId()).getOwnerId() == pid)
                 .forEach(forces::removeEntityFromForces);