Merge pull request #4810 from SJuliez/Bay_fix

Fix AbstractSmallCraftASFBay: Add null guard for game
MegaMek · Sep 28, 2023 · e685195 · e685195
2 parents ba4cb00 + d1d6c3c
commit e685195
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/AbstractSmallCraftASFBay.java b/megamek/src/megamek/common/AbstractSmallCraftASFBay.java
@@ -52,7 +52,13 @@ public double spaceForUnit(Entity unit) {
     @Override
     public double getUnused() {
         // loaded fighter squadrons can change size, therefore always update this
-        int used = troops.stream().map(game::getEntity).mapToInt(t -> (int) spaceForUnit(t)).sum();
+        int used = 0;
+        if (game != null) {
+            used = troops.stream()
+                    .map(game::getEntity)
+                    .mapToInt(t -> (int) spaceForUnit(t))
+                    .sum();
+        }
         currentSpace = totalSpace - used;
         return currentSpace - getBayDamage();
     }