BR#3361 - An error message is no longer displayed when a goto order c…

…ashes in a treasure train.
FreeCol · Jul 25, 2024 · 27dfe1c · 27dfe1c
1 parent 8d12e38
commit 27dfe1c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
@@ -1191,6 +1191,12 @@ private boolean moveToDestination(Unit unit, List<ModelMessage> messages) {
             ret = false;
         } else if (!movePath(unit, path)) {
             ret = false; // ask the player to resolve the movePath problem
+        } else if (unit.isDisposed() || !player.owns(unit)) {
+            /*
+             * Disposed in combat or cashed in treasure train. Do NOT display
+             * to the player (or we get an error message).
+             */
+            return true;
         } else if (unit.isAtLocation(destination)) {
             final Colony colony = (unit.hasTile()) ? unit.getTile().getColony()
                 : null;