From d22d7528535f6cb7908780407e3c1d7bfe57ddce Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 8 Nov 2024 21:43:44 +0200 Subject: [PATCH 24/24] Correct client knowledge about original city owner See RM #1067 Signed-off-by: Marko Lindqvist --- client/packhand.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/client/packhand.c b/client/packhand.c index d5c1dd6eb9..ea8a816533 100644 --- a/client/packhand.c +++ b/client/packhand.c @@ -746,11 +746,6 @@ void handle_city_info(const struct packet_city_info *packet) pcity->tile = pcenter; ptile = pcenter; pcity->owner = powner; - if (has_capability("city-original", client.conn.capability)) { - pcity->original = player_by_number(packet->original); - } else { - pcity->original = NULL; - } } else if (city_owner(pcity) != powner) { /* Remember what were the worked tiles. The server won't * send them to us again. */ @@ -813,6 +808,12 @@ void handle_city_info(const struct packet_city_info *packet) city_name_set(pcity, packet->name); } + if (has_capability("city-original", client.conn.capability)) { + pcity->original = player_by_number(packet->original); + } else { + pcity->original = NULL; + } + /* Check data */ city_size_set(pcity, 0); for (i = 0; i < FEELING_LAST; i++) { -- 2.45.2