Merge pull request #4741 from IllianiCBT/toe_whyWontYouMerge

Fixed Bad Merge (again)
MegaMek · Aug 28, 2024 · 198ce0e · 198ce0e
2 parents a41468a + 2ae632b
commit 198ce0e
Showing 1 changed file with 29 additions and 6 deletions.
diff --git a/MekHQ/src/mekhq/campaign/force/Force.java b/MekHQ/src/mekhq/campaign/force/Force.java
@@ -129,7 +129,9 @@ public Camouflage getCamouflage() {
     }
 
     public Camouflage getCamouflageOrElse(final Camouflage camouflage) {
-        return getCamouflage().hasDefaultCategory() ? ((getParentForce() == null) ? camouflage : getParentForce().getCamouflageOrElse(camouflage)) : getCamouflage();
+        return getCamouflage().hasDefaultCategory()
+                ? ((getParentForce() == null) ? camouflage : getParentForce().getCamouflageOrElse(camouflage))
+                : getCamouflage();
     }
 
     public void setCamouflage(Camouflage camouflage) {
@@ -432,7 +434,16 @@ public void setOverrideForceCommanderID(UUID overrideForceCommanderID) {
      * @return a list of UUIDs representing the eligible commanders
      */
     public List<UUID> getEligibleCommanders(Campaign campaign) {
-        List<UUID> eligibleCommanders = getUnits().stream().map(unitId -> campaign.getUnit(unitId).getCommander() != null ? campaign.getUnit(unitId).getCommander().getId() : null).filter(Objects::nonNull).collect(Collectors.toList());
+        List<UUID> eligibleCommanders = new ArrayList<>();
+
+        // don't use a stream here, it's not worth the added risk of an NPE
+        for (UUID unitId : getUnits()) {
+            Unit unit = campaign.getUnit(unitId);
+
+            if ((unit != null) && (unit.getCommander() != null)) {
+                eligibleCommanders.add(unit.getCommander().getId());
+            }
+        }
 
         // this means the force contains no Units, so we check against the leaders of the sub-forces
         if (eligibleCommanders.isEmpty()) {
@@ -515,10 +526,16 @@ public void removeSubForce(int id) {
      */
     public List<LayeredForceIconOperationalStatus> updateForceIconOperationalStatus(final Campaign campaign) {
         // First, update all subForces, collecting their unit statuses into a single list
-        final List<LayeredForceIconOperationalStatus> statuses = getSubForces().stream().flatMap(subForce -> subForce.updateForceIconOperationalStatus(campaign).stream()).collect(Collectors.toList());
+        final List<LayeredForceIconOperationalStatus> statuses = getSubForces().stream()
+                .flatMap(subForce -> subForce.updateForceIconOperationalStatus(campaign).stream())
+                .collect(Collectors.toList());
 
         // Then, Add the units assigned to this force
-        statuses.addAll(getUnits().stream().map(campaign::getUnit).filter(Objects::nonNull).map(LayeredForceIconOperationalStatus::determineLayeredForceIconOperationalStatus).toList());
+        statuses.addAll(getUnits().stream()
+                .map(campaign::getUnit)
+                .filter(Objects::nonNull)
+                .map(LayeredForceIconOperationalStatus::determineLayeredForceIconOperationalStatus)
+                .toList());
 
         // Can only update the icon for LayeredForceIcons, but still need to return the processed
         // units for parent force updates
@@ -535,7 +552,12 @@ public List<LayeredForceIconOperationalStatus> updateForceIconOperationalStatus(
             final int index = (int) Math.round(statuses.stream().mapToInt(Enum::ordinal).sum() / (statuses.size() * 1.0));
             final LayeredForceIconOperationalStatus status = LayeredForceIconOperationalStatus.values()[index];
             ((LayeredForceIcon) getForceIcon()).getPieces().put(LayeredForceIconLayer.SPECIAL_MODIFIER, new ArrayList<>());
-            ((LayeredForceIcon) getForceIcon()).getPieces().get(LayeredForceIconLayer.SPECIAL_MODIFIER).add(new ForcePieceIcon(LayeredForceIconLayer.SPECIAL_MODIFIER, MekHQ.getMHQOptions().getNewDayForceIconOperationalStatusStyle().getPath(), status.getFilename()));
+            ((LayeredForceIcon) getForceIcon()).getPieces().get(LayeredForceIconLayer.SPECIAL_MODIFIER)
+                    .add(new ForcePieceIcon(
+                            LayeredForceIconLayer.SPECIAL_MODIFIER,
+                            MekHQ.getMHQOptions().getNewDayForceIconOperationalStatusStyle().getPath(),
+                            status.getFilename())
+                    );
         }
 
         return statuses;
@@ -691,7 +713,8 @@ public Vector<Object> getAllChildren(Campaign campaign) {
                 }
             }
         }
-        units.sort((u1, u2) -> ((Comparable<Integer>) u2.getCommander().getRankNumeric()).compareTo(u1.getCommander().getRankNumeric()));
+        units.sort((u1, u2) -> ((Comparable<Integer>) u2.getCommander().getRankNumeric())
+                .compareTo(u1.getCommander().getRankNumeric()));
 
         children.addAll(units);
         children.addAll(unmannedUnits);