From 0f6e5acc95c959ac42098a58ba720ddd37c4e209 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 9 Mar 2022 05:42:52 +0200 Subject: [PATCH 38/38] Check legality of unit activities after city removed from the tile See osdn #44057 Signed-off-by: Marko Lindqvist --- server/citytools.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/citytools.c b/server/citytools.c index 48f2509802..adc27a8e10 100644 --- a/server/citytools.c +++ b/server/citytools.c @@ -1883,6 +1883,13 @@ void remove_city(struct city *pcity) } sync_cities(); + + unit_list_iterate(pcenter->units, punit) { + /* At least sentried helicopters need to go idle, maybe others. */ + if (!can_unit_continue_current_activity(punit)) { + unit_activity_handling(punit, ACTIVITY_IDLE); + } + } unit_list_iterate_end; } /************************************************************************//** -- 2.34.1