Merge pull request #4953 from kuronekochomusuke/npe_ghostTargetRoll

null check for ghostTargetRoll
MegaMek · Dec 13, 2023 · 0915c16 · 0915c16
2 parents 46f53fd + bc2af40
commit 0915c16
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
@@ -5187,7 +5187,7 @@ public boolean hasGhostTargets(boolean active) {
         }
 
         // if you failed your ghost target PSR, then it doesn't matter
-        if ((active && (getGhostTargetRollMoS() < 0)) || isShutDown()) {
+        if ((ghostTargetRoll == null) || (active && (getGhostTargetRollMoS() < 0)) || isShutDown()) {
             return false;
         }
         boolean hasGhost = false;