From 6d394ffa2694941f5517e90fbe5b722faf139fba Mon Sep 17 00:00:00 2001 From: Scoppio Date: Thu, 30 Jan 2025 22:14:44 -0300 Subject: [PATCH 1/2] fix: fixes NPE when clicking on the map with no unit selected --- megamek/src/megamek/client/ui/swing/MovementDisplay.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/megamek/src/megamek/client/ui/swing/MovementDisplay.java b/megamek/src/megamek/client/ui/swing/MovementDisplay.java index 81505af4232..569fc4aaafd 100644 --- a/megamek/src/megamek/client/ui/swing/MovementDisplay.java +++ b/megamek/src/megamek/client/ui/swing/MovementDisplay.java @@ -975,6 +975,9 @@ private void updateMove(boolean redrawMovement) { } private void updateFleeButton() { + if (ce() == null) { + return; + } boolean hasLastStep = (cmd != null) && (cmd.getLastStep() != null); boolean fleeStart = !hasLastStep && ce().canFlee(ce().getPosition()); From 4e8b379c66eff993f297471b4ba20b836924b725 Mon Sep 17 00:00:00 2001 From: Scoppio Date: Thu, 30 Jan 2025 22:23:46 -0300 Subject: [PATCH 2/2] fix: clicking next now select one unit --- megamek/src/megamek/client/ui/swing/MovementDisplay.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/megamek/src/megamek/client/ui/swing/MovementDisplay.java b/megamek/src/megamek/client/ui/swing/MovementDisplay.java index 569fc4aaafd..1e827e196a0 100644 --- a/megamek/src/megamek/client/ui/swing/MovementDisplay.java +++ b/megamek/src/megamek/client/ui/swing/MovementDisplay.java @@ -4668,6 +4668,10 @@ private void computeCFWarningHexes(Entity ce) { @Override public synchronized void actionPerformed(ActionEvent ev) { final Entity ce = ce(); + final String actionCmd = ev.getActionCommand(); + if (actionCmd.equals(MoveCommand.MOVE_NEXT.getCmd())) { + selectEntity(clientgui.getClient().getNextEntityNum(currentEntity)); + } if (ce == null) { return; @@ -4681,7 +4685,6 @@ public synchronized void actionPerformed(ActionEvent ev) { // odd... return; } - final String actionCmd = ev.getActionCommand(); final IGameOptions opts = clientgui.getClient().getGame().getOptions(); if (actionCmd.equals(MoveCommand.MOVE_NEXT.getCmd())) { selectEntity(clientgui.getClient().getNextEntityNum(currentEntity));