refactor: Use stream composition for finding TAG spotters

MegaMek · Aug 18, 2024 · 2db8795 · 2db8795
1 parent 175a3f1
commit 2db8795
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/megamek/src/megamek/common/actions/WeaponAttackAction.java b/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);
             }
         }