Merge pull request #4787 from NickAragua/nerf_igauss_aero

Fix #4768
MegaMek · Sep 17, 2023 · 51f0449 · 51f0449
2 parents d3a1579 + 4dfe64b
commit 51f0449
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/actions/WeaponAttackAction.java b/megamek/src/megamek/common/actions/WeaponAttackAction.java
@@ -3705,7 +3705,10 @@ private static ToHitData compileAeroAttackerToHitMods(Game game, Entity ae, Targ
             // check for heavy gauss rifle on fighter of small craft
             // Arguably a weapon effect, except that it only applies when used by a fighter (isn't recoil fun?)
             // So it's here instead of with other weapon mods that apply across the board
-            if ((wtype instanceof ISHGaussRifle) && !(ae instanceof Dropship)
+            if ((wtype != null) &&
+                    ((wtype.ammoType == AmmoType.T_GAUSS_HEAVY) ||
+                    (wtype.ammoType == AmmoType.T_IGAUSS_HEAVY)) && 
+                    !(ae instanceof Dropship)
                     && !(ae instanceof Jumpship)) {
                 toHit.addModifier(+1, Messages.getString("WeaponAttackAction.FighterHeavyGauss"));
             }