From f1e6ac7b896280b8eca139731e4d11d1df9e70f8 Mon Sep 17 00:00:00 2001
From: hided62 <hided62@gmail.com>
Date: Thu, 29 Feb 2024 10:35:32 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9D=B4=EB=AF=BC=EC=A1=B1=20=EB=8F=84?=
 =?UTF-8?q?=EC=8B=9C=20=EC=9D=B4=EB=8F=99=20=EA=B7=9C=EC=B9=99=20=EC=9E=AC?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1=20-=20=EB=AC=B4=ED=95=9C=EB=A3=A8=ED=94=84?=
 =?UTF-8?q?=EC=9D=BC=20=EC=88=98=20=EC=9E=88=EC=9C=BC=EB=AF=80=EB=A1=9C=20?=
 =?UTF-8?q?=EA=B7=B8=EB=83=A5=20SQL=EC=97=90=20NOT=20IN=EC=9D=84=20?=
 =?UTF-8?q?=EB=84=A3=EC=9E=90..?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Event/Action/RaiseInvader.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hwe/sammo/Event/Action/RaiseInvader.php b/hwe/sammo/Event/Action/RaiseInvader.php
index fa2fba83..c043a0b9 100644
--- a/hwe/sammo/Event/Action/RaiseInvader.php
+++ b/hwe/sammo/Event/Action/RaiseInvader.php
@@ -67,15 +67,13 @@ class RaiseInvader extends \sammo\Event\Action
 
         foreach ($db->queryAllLists('SELECT capital, nation from nation WHERE capital in %li', $cities) as $row) {
             [$oldCapital, $nation] = $row;
-            $capitalCandidates = $db->queryFirstColumn('SELECT city from city WHERE nation = %i AND city != %i', $nation, $oldCapital);
+            $capitalCandidates = $db->queryFirstColumn('SELECT city from city WHERE nation = %i AND city != %i NOT IN %li', $nation, $oldCapital, $cities);
             if (!$capitalCandidates) {
                 $disabledInvaderCity->add($oldCapital);
                 continue;
             }
             
-            do {
-                $newCapital = $rng->choice($capitalCandidates);
-            } while(in_array($newCapital, $cities));
+            $newCapital = $rng->choice($capitalCandidates);
             
             $db->update('nation', ['capital' => $newCapital], 'nation=%i', $nation);
             $db->update('general', ['city' => $newCapital], 'nation=%i and city=%i', $nation, $oldCapital);