refactor: Use stream composition for BA Narc targeting

MegaMek · Aug 21, 2024 · f45da84 · f45da84
1 parent 88b5b8d
commit f45da84
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/megamek/src/megamek/common/actions/WeaponAttackAction.java b/megamek/src/megamek/common/actions/WeaponAttackAction.java
@@ -1881,20 +1881,16 @@ private static String toHitIsImpossible(Game game, Entity ae, int attackerId, Ta
             // BA compact narc: we have one weapon for each trooper, but you
             // can fire only at one target at a time
             if (wtype.getName().equals("Compact Narc")) {
-                for (Enumeration<EntityAction> i = game.getActions(); i.hasMoreElements();) {
-                    EntityAction ea = i.nextElement();
-                    if (!(ea instanceof WeaponAttackAction)) {
-                        continue;
-                    }
-                    final WeaponAttackAction prevAttack = (WeaponAttackAction) ea;
-                    if (prevAttack.getEntityId() == attackerId) {
-                        Mounted prevWeapon = ae.getEquipment(prevAttack.getWeaponId());
-                        if (prevWeapon.getType().getName().equals("Compact Narc")) {
-                            if (prevAttack.getTargetId() != target.getId()) {
-                                return Messages.getString("WeaponAttackAction.OneTargetForCNarc");
-                            }
-                        }
-                    }
+                if (game.getActionsVector().stream()
+                    .filter(WeaponAttackAction.class::isInstance)
+                    .map(WeaponAttackAction.class::cast)
+                    .anyMatch(prevAttack -> prevAttack.getEntityId() == attackerId
+                        && ae.getEquipment(prevAttack.getWeaponId())
+                            .getType().getName().equals("Compact Narc")
+                        && prevAttack.getTargetId() != target.getId()
+                    )
+                ) {
+                    return Messages.getString("WeaponAttackAction.OneTargetForCNarc");
                 }
             }