Merge pull request #1405 from MegaMek/system_crit_cme

Fix concurrent modification exception when resetting system crits
MegaMek · Feb 1, 2024 · 43e80e1 · 43e80e1
2 parents fe3f6ed + 3d7406a
commit 43e80e1
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/megameklab/src/megameklab/ui/mek/BMStructureTab.java b/megameklab/src/megameklab/ui/mek/BMStructureTab.java
@@ -325,12 +325,12 @@ && getMech().getCritical(Mech.LOC_RT, i).getType() == CriticalSlot.TYPE_EQUIPMEN
             getMech().setCritical(Mech.LOC_CT, lgSlot, crit);
         }
         // Replace any fixed spreadable equipment
-        for (Mounted mount : getMech().getMisc()) {
-            if ((mount.getLocation() == Entity.LOC_NONE)
-                    && UnitUtil.isFixedLocationSpreadEquipment(mount.getType())) {
-                UnitUtil.removeMounted(getMech(), mount);
-                MekUtil.createSpreadMounts(getMech(), mount.getType());
-            }
+        List<Mounted> toRemove = getMech().getMisc().stream()
+                .filter(m -> (m.getLocation() == Entity.LOC_NONE) && UnitUtil.isFixedLocationSpreadEquipment(m.getType()))
+                .collect(Collectors.toList());
+        for (Mounted mounted : toRemove) {
+            UnitUtil.removeMounted(getMech(), mounted);
+            MekUtil.createSpreadMounts(getMech(), mounted.getType());
         }
         refresh.refreshBuild();
     }