Merge pull request #5269 from kuronekochomusuke/issue_5268

fix npe on skip movement
MegaMek · Mar 20, 2024 · ee387c1 · ee387c1
2 parents 7e5105c + fdc9e84
commit ee387c1
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/MovementDisplay.java b/megamek/src/megamek/client/ui/swing/MovementDisplay.java
@@ -1653,7 +1653,8 @@ && ce().canUnjamRAC()
 
         if (needNagForOther()) {
             if ((ce() != null)
-                    && (null != cmd)) {
+                    && (null != cmd)
+                    && ce().isAero()) {
                 boolean airborneOrSpaceborne = ce().isAirborne()
                         || ce().isSpaceborne();
                 boolean unusedVelocity = false;
@@ -1667,7 +1668,6 @@ && ce().canUnjamRAC()
                         || cmd.contains(MoveStepType.RETURN);
                 if (airborneOrSpaceborne
                         && !clientgui.getClient().getGame().useVectorMove()
-                        && ce().isAero()
                         && !((IAero) ce()).isOutControlTotal()
                         && unusedVelocity
                         && !offOrReturn
@@ -1697,16 +1697,16 @@ && ce().isAssaultDropInProgress()
         }
 
         if (needNagForOther()) {
-            if (ce() != null) {
+            if (ce() != null
+                    && (ce() instanceof Infantry)
+                    && ((Infantry) ce()).hasMicrolite()
+            ) {
                 boolean finalElevation = (ce().getElevation() != cmd.getFinalElevation());
                 boolean airborneVTOLOrWIGEOrFinalElevation = ce().isAirborneVTOLorWIGE()
                         || finalElevation;
                 int terrainLevelBuilding = ce().getGame().getBoard().getHex(cmd.getFinalCoords()).terrainLevel(Terrains.BLDG_ELEV);
                 int terrainLevelBridge = ce().getGame().getBoard().getHex(cmd.getFinalCoords()).terrainLevel(Terrains.BRIDGE_ELEV);
-                if ((ce() != null)
-                        && (ce() instanceof Infantry)
-                        && ((Infantry) ce()).hasMicrolite()
-                        && airborneVTOLOrWIGEOrFinalElevation
+                if (airborneVTOLOrWIGEOrFinalElevation
                         && !cmd.contains(MoveStepType.FORWARDS)
                         && !cmd.contains(MoveStepType.FLEE)
                         && cmd.getFinalElevation() > 0