longturn#2478 Trigger bounce failure callback before unloading transport

jwrober · Jan 6, 2025 · 1f5d461 · 1f5d461
1 parent f47cde2
commit 1f5d461
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/server/unittools.cpp b/server/unittools.cpp
@@ -1413,6 +1413,10 @@ void bounce_unit(struct unit *punit, int max_distance,
     }
   }
 
+  if (on_failure) {
+    on_failure({.bunit = punit});
+  }
+
   /* Didn't find a place to bounce the unit, going to disband it.
    * Try to bounce transported units. */
   if (0 < get_transporter_occupancy(punit)) {
@@ -1428,10 +1432,6 @@ void bounce_unit(struct unit *punit, int max_distance,
     }
   }
 
-  if (on_failure) {
-    on_failure({.bunit = punit});
-  }
-
   wipe_unit(punit, ULR_STACK_CONFLICT, nullptr);
 }