Merge pull request MegaMek#4799 from Sleet01/fix_4796_silent_NPE_in_p…

…rincess_during_offboard_arty_firing_and_ADA_check Fix MegaMek#4796
Sleet01 · Sep 21, 2023 · 59dee6b · 59dee6b
2 parents 60603a2 + f508935
commit 59dee6b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/megamek/src/megamek/client/bot/princess/ArtilleryTargetingControl.java b/megamek/src/megamek/client/bot/princess/ArtilleryTargetingControl.java
@@ -170,13 +170,14 @@ public void initializeForTargetingPhase() {
     private boolean getADAAvailable(Entity shooter){
         boolean available = false;
         for (Mounted weapon: shooter.getWeaponList()){
-            if(((AmmoType) weapon.getLinked().getType()).getMunitionType().contains(AmmoType.Munitions.M_ADA)
-                && !weapon.isFired() && weapon.getLinked().getUsableShotsLeft() > 0){
-                available = true;
-                break;
+            if (weapon.getType().hasFlag(WeaponType.F_ARTILLERY)){
+                if(((AmmoType) weapon.getLinked().getType()).getMunitionType().contains(AmmoType.Munitions.M_ADA)
+                    && !weapon.isFired() && weapon.getLinked().getUsableShotsLeft() > 0) {
+                    available = true;
+                    break;
+                }
             }
         }
-
         return available;
     }
     /**