Merge pull request #6298 from psikomonkie/issue-6273-flak-can-make-ai…

…med-shot-against-immobile Issue 6273: Prevent flak from making aimed shots on immobile targets
MegaMek · Dec 22, 2024 · aabb973 · aabb973
2 parents 73ee61b + 317b175
commit aabb973
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/actions/WeaponAttackAction.java b/megamek/src/megamek/common/actions/WeaponAttackAction.java
@@ -4427,7 +4427,11 @@ else if ((atype != null)
             if ((null != te) && !te.isAirborne() && !te.isSpaceborne() && (te instanceof Dropship)) {
                 immobileMod = new ToHitData(-4, Messages.getString("WeaponAttackAction.ImmobileDs"));
             } else {
-                immobileMod = Compute.getImmobileMod(target, aimingAt, aimingMode);
+                if(Compute.allowAimedShotWith(weapon, aimingMode)) {
+                    immobileMod = Compute.getImmobileMod(target, aimingAt, aimingMode);
+                } else {
+                    immobileMod = Compute.getImmobileMod(target, aimingAt, AimingMode.NONE);
+                }
             }
 
             if (immobileMod != null) {