Issue 6224: NPE when air fails maneuver and flies off map

MegaMek · Dec 10, 2024 · 087278c · 087278c
1 parent b049c9a
commit 087278c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/megamek/src/megamek/server/totalwarfare/MovePathHandler.java b/megamek/src/megamek/server/totalwarfare/MovePathHandler.java
@@ -1561,6 +1561,7 @@ private void processSteps() {
                             a.setStraightMoves(a.getStraightMoves() + 1);
                             // make sure it didn't fly off the map
                             if (!getGame().getBoard().contains(curPos)) {
+                                curPos = curPos.translated(step.getFacing(), -1); //Return its position to on-map so it can be targeted this turn
                                 a.setCurrentVelocity(md.getFinalVelocity());
                                 gameManager.processLeaveMap(md, true, Compute.roundsUntilReturn(getGame(), entity));
                                 return;