From 757e0fcc8efc628485b4ddf0ae63d78ba1d84250 Mon Sep 17 00:00:00 2001
From: novgorodschi catalin <cata7007@gmail.com>
Date: Mon, 29 Jun 2026 07:48:24 +0300
Subject: [PATCH] Fix #292 gold club addraid/edit raid

Fix gold club -> add raid and edit raid duplicate
---
 Templates/goldClub/farmlist_addraid.tpl  | 11 +++++++++--
 Templates/goldClub/farmlist_editraid.tpl | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Templates/goldClub/farmlist_addraid.tpl b/Templates/goldClub/farmlist_addraid.tpl
index aa49019e..edae3e5a 100644
--- a/Templates/goldClub/farmlist_addraid.tpl
+++ b/Templates/goldClub/farmlist_addraid.tpl
@@ -209,13 +209,20 @@ if ($action === 'addSlot' && $lid) {
 
                             <select name="target_id">
                                 <?php
-                                $getwref = "SELECT movement.to, movement.ref, attacks.* 
+                                // Bug fix: previously selected one row per individual past raid
+                                // (no GROUP BY / ORDER BY), so the same target appeared once per
+                                // raid ever sent to it, in whatever order MySQL happened to return
+                                // rows. Group by target so each appears once, ordered by the most
+                                // recent raid time so the latest target is consistently last.
+                                $getwref = "SELECT movement.to, MAX(movement.endtime) AS last_endtime
                                             FROM ".TB_PREFIX."movement movement
                                             INNER JOIN ".TB_PREFIX."attacks attacks 
                                             ON attacks.id = movement.ref
                                             WHERE attacks.attack_type = 4 
                                             AND movement.proc = 1 
-                                            AND movement.from = ".$village->wid;
+                                            AND movement.from = ".$village->wid."
+                                            GROUP BY movement.to
+                                            ORDER BY last_endtime ASC";
 
                                 $arraywref = $database->query_return($getwref);
 
diff --git a/Templates/goldClub/farmlist_editraid.tpl b/Templates/goldClub/farmlist_editraid.tpl
index 939dd1d2..16e76a64 100644
--- a/Templates/goldClub/farmlist_editraid.tpl
+++ b/Templates/goldClub/farmlist_editraid.tpl
@@ -236,13 +236,20 @@ if (
                         <select name="target_id">
 
                             <?php
-                            $getwref = "SELECT movement.to, movement.ref, attacks.* 
+                            // Bug fix: previously selected one row per individual past raid
+                            // (no GROUP BY / ORDER BY), so the same target appeared once per raid
+                            // ever sent to it, in whatever order MySQL happened to return rows.
+                            // Group by target so each appears once, ordered by the most recent
+                            // raid time so the latest target is consistently last.
+                            $getwref = "SELECT movement.to, MAX(movement.endtime) AS last_endtime
                                         FROM ".TB_PREFIX."movement movement
                                         INNER JOIN ".TB_PREFIX."attacks attacks 
                                         ON attacks.id = movement.ref
                                         WHERE attacks.attack_type = 4 
                                         AND movement.proc = 1 
-                                        AND movement.from = ".$village->wid;
+                                        AND movement.from = ".$village->wid."
+                                        GROUP BY movement.to
+                                        ORDER BY last_endtime ASC";
 
                             $arraywref = $database->query_return($getwref);