Issue 6247:NPE with TacOps Energy Weapons when Changing Firing Mode

MegaMek · Dec 9, 2024 · 1df760f · 1df760f
1 parent bc7319a
commit 1df760f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/megamek/src/megamek/common/weapons/lasers/LaserWeapon.java b/megamek/src/megamek/common/weapons/lasers/LaserWeapon.java
@@ -47,13 +47,13 @@ public void adaptToGameOptions(GameOptions gOp) {
         super.adaptToGameOptions(gOp);
 
         if (!(this instanceof PulseLaserWeapon)) {
-            if (modes.isEmpty()) {
+            if (!hasModes()) {
                 addMode("");
                 addMode("Pulse");
             }
             else {
                 for (var mode : Collections.list(getModes())) {
-                    if(!mode.getName().contains("Pulse")) {
+                    if(!mode.getName().contains("Pulse") && !mode.getName().isEmpty()) {
                         addMode("Pulse " + mode.getName());
                     }
                 }