Merge pull request #5875 from Algebro7/fix-erroneous-edge-rerolls

Always check if crew is KOed before rerolling edge
MegaMek · Aug 8, 2024 · aed40bb · aed40bb
2 parents b354eed + 1bdf04c
commit aed40bb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
@@ -20574,9 +20574,9 @@ private Vector<Report> resolveCrewDamage(Entity e, int damage, int crewPos) {
                     // return true;
                 } // else
                 vDesc.add(r);
-            } while ((e.shouldUseEdge(OptionsConstants.EDGE_WHEN_KO)
-                    && e.getCrew().isKoThisRound(crewPos))
-                    || e.shouldUseEdge(OptionsConstants.EDGE_WHEN_AERO_KO));
+            } while (e.getCrew().isKoThisRound(crewPos)
+                    && (e.shouldUseEdge(OptionsConstants.EDGE_WHEN_KO)
+                    || e.shouldUseEdge(OptionsConstants.EDGE_WHEN_AERO_KO)));
             // end of do-while
             if (e.getCrew().isKoThisRound(crewPos)) {
                 boolean wasPilot = e.getCrew().getCurrentPilotIndex() == crewPos;