From ce699e4ecf0083ec6c569abf9b89c870c6158127 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 8 Nov 2024 21:41:07 +0200 Subject: [PATCH 59/59] Correct client knowledge about original city owner See RM #1067 Signed-off-by: Marko Lindqvist --- client/packhand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/packhand.c b/client/packhand.c index 24d2312457..92b84ece3c 100644 --- a/client/packhand.c +++ b/client/packhand.c @@ -706,7 +706,6 @@ void handle_city_info(const struct packet_city_info *packet) pcity->tile = pcenter; ptile = pcenter; pcity->owner = powner; - pcity->original = player_by_number(packet->original); } else if (city_owner(pcity) != powner) { /* Remember what were the worked tiles. The server won't * send them to us again. */ @@ -768,6 +767,8 @@ void handle_city_info(const struct packet_city_info *packet) city_name_set(pcity, packet->name); } + pcity->original = player_by_number(packet->original); + /* Check data */ city_size_set(pcity, 0); for (i = 0; i < FEELING_LAST; i++) { -- 2.45.2