only lock undo when needed

server/src/action.rs

@@ -283,7 +283,6 @@ pub(crate) fn execute_movement_action(
                     starting_position,
                     m.destination,
                 );
-                stop_current_move(game);
                 return;
             }
 

server/src/combat.rs

@@ -187,6 +187,8 @@ pub fn initiate_combat(
 
 pub(crate) fn start_combat(game: &mut Game) {
     game.lock_undo(); // combat should not be undoable
+    stop_current_move(game);
+
     let combat = get_combat(game);
     let attacker = combat.attacker;
     let defender = combat.defender;
@@ -388,9 +390,6 @@ pub(crate) fn end_combat(game: &mut Game, combat: Combat, r: CombatResult) -> Op
     }
 
     take_combat(game);
-    if let Some(GameState::Movement(_)) = game.state_stack.last() {
-        stop_current_move(game);
-    }
     None
 }
 

server/src/explore.rs

@@ -28,6 +28,7 @@ pub(crate) fn move_to_unexplored_tile(
     destination: Position,
 ) -> bool {
     game.lock_undo(); // tile is revealed, so we can't undo the move
+    stop_current_move(game);
 
     for b in &game.map.unexplored_blocks.clone() {
         for (position, _tile) in b.block.tiles(&b.position, b.position.rotation) {
@@ -301,7 +302,6 @@ pub(crate) fn explore_resolution() -> Builtin {
                 r.destination,
                 r.ship_can_teleport,
             );
-            stop_current_move(game);
         },
     )
     .build()

server/tests/test_games/combat/ship_combat.outcome1.json

@@ -7,7 +7,14 @@
         "moved_units": [
           7,
           8
-        ]
+        ],
+        "current_move": {
+          "Fleet": {
+            "units": [
+              8
+            ]
+          }
+        }
       }
     }
   ],
@@ -396,17 +403,15 @@
             "unit_type": "Ship"
           }
         },
+        {
+          "op": "replace",
+          "path": "/state/1/Movement/current_move/Fleet/units/0",
+          "value": 7
+        },
         {
           "op": "add",
-          "path": "/state/1/Movement/current_move",
-          "value": {
-            "Fleet": {
-              "units": [
-                7,
-                8
-              ]
-            }
-          }
+          "path": "/state/1/Movement/current_move/Fleet/units/1",
+          "value": 8
         },
         {
           "op": "add",