null guard

MegaMek · Nov 3, 2024 · eccae84 · eccae84
1 parent 4bf1901
commit eccae84
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
@@ -7716,7 +7716,7 @@ public PilotingRollData checkSkid(EntityMovementType moveType, Hex prevHex,
             addPilotingModifierForTerrain(roll, lastPos);
         }
 
-        boolean prevStepPavement = (prevStep != null) ? prevStep.isPavementStep() : prevHex.hasPavement();
+        boolean prevStepPavement = (prevStep != null) ? prevStep.isPavementStep() : ((prevHex != null) && prevHex.hasPavement());
         PlanetaryConditions conditions = game.getPlanetaryConditions();
         boolean affectedByIce = !movementMode.isHoverOrWiGE() || conditions.getWind().isStrongerThan(Wind.STRONG_GALE);
         boolean runOrSprint = (overallMoveType == EntityMovementType.MOVE_RUN) || (overallMoveType == EntityMovementType.MOVE_SPRINT);