Weapon attack cleanup

megamek/src/megamek/common/actions/WeaponAttackAction.java

@@ -555,11 +555,12 @@ private static ToHitData toHitCalc(Game game, int attackerId, Targetable target,
                             || (atype.getAmmoType() == AmmoType.T_NLRM)
                             || (atype.getAmmoType() == AmmoType.T_MEK_MORTAR))
                     && (munition.contains(AmmoType.Munitions.M_SEMIGUIDED))) {
-                for (TagInfo ti : game.getTagInfo()) {
-                    if (target.getId() == ti.target.getId()) {
-                        spotter = game.getEntity(ti.attackerId);
-                    }
-                }
+                final Targetable currentTarget = target; // Required for concurrency reasons
+                spotter = game.getTagInfo().stream()
+                    .filter(ti -> currentTarget.getId() == ti.target.getId())
+                    .findAny()
+                    .map(ti -> game.getEntity(ti.attackerId))
+                    .orElse(null);
             }
         }
 
@@ -954,11 +955,8 @@ private static String toHitIsImpossible(Game game, Entity ae, int attackerId, Ta
             toHit = new ToHitData();
         }
 
-        Entity te = null;
-        if (ttype == Targetable.TYPE_ENTITY) {
-            //Some weapons only target valid entities
-            te = (Entity) target;
-        }
+        //Some weapons only target valid entities
+        final Entity te = ttype == Targetable.TYPE_ENTITY ? (Entity) target : null;
 
         // If the attacker and target are in the same building & hex, they can
         // always attack each other, TW pg 175.
@@ -1275,13 +1273,9 @@ private static String toHitIsImpossible(Game game, Entity ae, int attackerId, Ta
                 && ae.isSpaceborne()) {
             boolean networkFiringSolution = false;
             //Check to see if the attacker has a firing solution. Naval C3 networks share targeting data
-            if (ae.hasNavalC3()) {
-                for (Entity en : game.getC3NetworkMembers(ae)) {
-                    if (te != null && en.hasFiringSolutionFor(te.getId())) {
-                        networkFiringSolution = true;
-                        break;
-                    }
-                }
+            if (ae.hasNavalC3() && te != null
+                && game.getC3NetworkMembers(ae).stream().anyMatch(en -> en.hasFiringSolutionFor(te.getId()))) {
+                networkFiringSolution = true;
             }
             if (!networkFiringSolution) {
                 //If we don't check for target type here, we can't fire screens and missiles at hexes...
@@ -1303,15 +1297,14 @@ private static String toHitIsImpossible(Game game, Entity ae, int attackerId, Ta
                         && (te != null) && te.hasSeenEntity(ae.getOwner()))
                 && !isArtilleryIndirect && !isIndirect && !isBearingsOnlyMissile) {
             boolean networkSee = false;
-            if (ae.hasC3() || ae.hasC3i() || ae.hasActiveNovaCEWS()) {
+            if (ae.hasC3() || ae.hasC3i() || ae.hasActiveNovaCEWS()
+                && game.getEntitiesVector().stream().anyMatch(en ->
+                    !en.isEnemyOf(ae)
+                    && en.onSameC3NetworkAs(ae)
+                    && Compute.canSee(game, en, target))) {
                 // c3 units can fire if any other unit in their network is in
                 // visual or sensor range
-                for (Entity en : game.getEntitiesVector()) {
-                    if (!en.isEnemyOf(ae) && en.onSameC3NetworkAs(ae) && Compute.canSee(game, en, target)) {
-                        networkSee = true;
-                        break;
-                    }
-                }
+                networkSee = true;
             }
             if (!networkSee) {
                 if (!Compute.inSensorRange(game, ae, target, null)) {
@@ -1410,27 +1403,17 @@ private static String toHitIsImpossible(Game game, Entity ae, int attackerId, Ta
 
         // limit large craft to zero net heat and to heat by arc
         final int heatCapacity = ae.getHeatCapacity();
-        if (ae.usesWeaponBays() && (weapon != null) && !weapon.getBayWeapons().isEmpty()) {
+        if (ae.usesWeaponBays() && (weapon != null)) {
             int totalHeat = 0;
 
             // first check to see if there are any usable weapons
-            boolean usable = false;
-            for (WeaponMounted m : weapon.getBayWeapons()) {
-                WeaponType bayWType = m.getType();
-                boolean bayWUsesAmmo = (bayWType.getAmmoType() != AmmoType.T_NA);
-                if (m.canFire()) {
-                    if (bayWUsesAmmo) {
-                        if ((m.getLinked() != null) && (m.getLinked().getUsableShotsLeft() > 0)) {
-                            usable = true;
-                            break;
-                        }
-                    } else {
-                        usable = true;
-                        break;
-                    }
-                }
-            }
-            if (!usable) {
+            if (!weapon.streamBayWeapons()
+                .filter(WeaponMounted::canFire)
+                .anyMatch(m ->
+                    m.getType().getAmmoType() == AmmoType.T_NA
+                    || Optional.ofNullable(m.getLinked()).map(a -> a.getUsableShotsLeft() > 0).orElse(false)
+                )
+            ) {
                 return Messages.getString("WeaponAttackAction.BayNotReady");
             }
 

megamek/src/megamek/common/equipment/WeaponMounted.java

@@ -30,6 +30,7 @@
 import java.util.Objects;
 import java.util.Vector;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class WeaponMounted extends Mounted<WeaponType> {
 
@@ -207,12 +208,19 @@ public void clearBayWeapons() {
     }
 
     /**
-     * @return All the weapon mounts in the bay.
+     * @return A stream containing the weapon mounts in the bay.
      */
-    public List<WeaponMounted> getBayWeapons() {
+    public Stream<WeaponMounted> streamBayWeapons() {
         return bayWeapons.stream()
                 .map(i -> getEntity().getWeapon(i))
-                .filter(Objects::nonNull)
+                .filter(Objects::nonNull);
+    }
+
+    /**
+     * @return All the weapon mounts in the bay.
+     */
+    public List<WeaponMounted> getBayWeapons() {
+        return streamBayWeapons()
                 .collect(Collectors.toList());
     }