From 7f9ad8b7d52943e1012320a7f4559d28686a1ced Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Sat, 20 May 2023 01:03:19 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=A0=95=EB=9E=80/=EB=B2=BD=EB=A0=A5?=
 =?UTF-8?q?=EC=9D=98=20=EC=84=B1=EB=B2=BD=EC=84=A0=EC=A0=9C=EA=B0=80=20?=
 =?UTF-8?q?=EC=A0=95=EC=83=81=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C=20-=20=EC=88=98=EB=B9=84/=EC=84=B1=EB=B2=BD=20-=20?=
 =?UTF-8?q?=EC=A0=90=EC=9C=A0=EC=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/process_war.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hwe/process_war.php b/hwe/process_war.php
index 45bf6c5c..fb22ae75 100644
--- a/hwe/process_war.php
+++ b/hwe/process_war.php
@@ -480,13 +480,13 @@ function processWar_NG(
     $attacker->finishBattle();
     $defender->finishBattle();
 
-    if($city->getDead()){
-        $city->setSiege();
-        $city->finishBattle();
-    }
+    if($city->getDead() || $defender instanceof WarUnitCity){
+        if($city !== $defender){
+            $city->finishBattle();
+            $city->setSiege();
+        }
 
-    if ($defender instanceof WarUnitCity) {
-        $newConflict = $defender->addConflict();
+        $newConflict = $city->addConflict();
         if ($newConflict) {
             $nationName = $attacker->getNationVar('name');
             $josaYi = JosaUtil::pick($nationName, '이');