From b8f458943b19ba376cdff91a196a0d5d0bd7340d Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Mon, 24 Jun 2024 00:19:23 +0300
Subject: [PATCH 14/14] Correct actor id in action query response from server
 to client

Reported by StefanJ

See RM #728

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 server/unithand.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/unithand.c b/server/unithand.c
index fdaed646aa..319b908c7e 100644
--- a/server/unithand.c
+++ b/server/unithand.c
@@ -3053,7 +3053,7 @@ void handle_unit_action_query(struct connection *pc,
         && is_action_enabled_unit_on_unit(nmap, action_type,
                                           pactor, punit)) {
       dsend_packet_unit_action_answer(pc,
-                                      actor_id32, actor_id16, target_id,
+                                      actor_id32, actor_id32, target_id,
                                       unit_bribe_cost(punit, pplayer),
                                       action_type, request_kind);
     } else {
@@ -3069,7 +3069,7 @@ void handle_unit_action_query(struct connection *pc,
         && is_action_enabled_unit_on_city(nmap, action_type,
                                           pactor, pcity)) {
       dsend_packet_unit_action_answer(pc,
-                                      actor_id32, actor_id16, target_id,
+                                      actor_id32, actor_id32, target_id,
                                       city_incite_cost(pplayer, pcity),
                                       action_type, request_kind);
     } else {
@@ -3094,7 +3094,7 @@ void handle_unit_action_query(struct connection *pc,
                                       unit_type_get(pactor), tgt_utype);
 
       dsend_packet_unit_action_answer(pc,
-                                      actor_id32, actor_id16, target_id,
+                                      actor_id32, actor_id32, target_id,
                                       upgr_cost, action_type,
                                       request_kind);
     } else {
-- 
2.43.0

