Merge pull request #4671 from MegaMek/name_loading_fix

check for units without operators
MegaMek · Aug 18, 2024 · 03786aa · 03786aa
2 parents c515f9c + 9bbbc0f
commit 03786aa
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/MekHQ/src/mekhq/campaign/force/Force.java b/MekHQ/src/mekhq/campaign/force/Force.java
@@ -435,7 +435,8 @@ public void setOverrideForceCommanderID(UUID overrideForceCommanderID) {
      */
     public List<UUID> getEligibleCommanders(Campaign campaign) {
         List<UUID> eligibleCommanders = getUnits().stream()
-                .map(unitId -> campaign.getUnit(unitId).getCommander().getId())
+                .map(unitId -> campaign.getUnit(unitId).getCommander() != null ?
+                		campaign.getUnit(unitId).getCommander().getId() : null)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());