Skip to content

Commit 1490af8

Browse files
committed
Revert "Fix FighterSquadron heavily damaged status and bomb loading NPE"
This reverts commit a8ea71e.
1 parent ca09849 commit 1490af8

File tree

1 file changed

+1
-26
lines changed

1 file changed

+1
-26
lines changed

megamek/src/megamek/common/units/FighterSquadron.java

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,7 @@ private void loadBombEquipment(BombLoadout capabilities) {
609609
BombTypeEnum bombType = entry.getKey();
610610
int count = entry.getValue();
611611

612-
// Skip bombs not allowed by game options (if game is available)
613-
if ((game != null) && !bombType.isAllowedByGameOptions(game.getOptions())) {
612+
if (!bombType.isAllowedByGameOptions(game.getOptions())) {
614613
continue;
615614
}
616615

@@ -886,30 +885,6 @@ public boolean isCapitalScale() {
886885
return true;
887886
}
888887

889-
/**
890-
* Overrides Aero's isDmgHeavy to properly reflect squadron damage state. A squadron is considered heavily damaged
891-
* if a majority of its active fighters are heavily damaged.
892-
*
893-
* @return true if the squadron should be considered heavily damaged
894-
*/
895-
@Override
896-
public boolean isDmgHeavy() {
897-
List<Entity> activeFighters = getActiveSubEntities();
898-
if (activeFighters.isEmpty()) {
899-
return true;
900-
}
901-
902-
int heavilyDamagedCount = 0;
903-
for (Entity fighter : activeFighters) {
904-
if (fighter.isDmgHeavy()) {
905-
heavilyDamagedCount++;
906-
}
907-
}
908-
909-
// Squadron is heavily damaged if majority of fighters are
910-
return heavilyDamagedCount > activeFighters.size() / 2;
911-
}
912-
913888
/**
914889
* Override of Entity method. This needs to be set, or we can't do a reverse lookup from a Capital Fighter to its
915890
* Squadron.

0 commit comments

Comments
 (0)