From f2a2b338cd516c632e43d7dbddc177fbd1e185b4 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 13 Apr 2022 03:05:23 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=A0=84=ED=88=AC=20=EA=B2=B0=EA=B3=BC?=
 =?UTF-8?q?=EA=B0=80=20=EC=A4=91=EB=B3=B5=20=EA=B8=B0=EB=A1=9D=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/process_war.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hwe/process_war.php b/hwe/process_war.php
index f2d2a59f..a39633cd 100644
--- a/hwe/process_war.php
+++ b/hwe/process_war.php
@@ -231,7 +231,10 @@ function processWar_NG(
     $logger->pushGlobalActionLog("<D><b>{$attacker->getNationVar('name')}</b></>의 <Y>{$attacker->getName()}</>{$josaYi} <G><b>{$city->getName()}</b></>{$josaRo} 진격합니다.");
     $logger->pushGeneralActionLog("<G><b>{$city->getName()}</b></>{$josaRo} <M>진격</>합니다. <1>$date</>");
 
+    $logWritten = false;
+
     while($attacker->getPhase() < $attacker->getMaxPhase()){
+        $logWritten = false;
         if ($defender === null) {
             $defender = $city;
 
@@ -371,6 +374,8 @@ function processWar_NG(
         $defender->addPhase();
 
         if (!$attacker->continueWar($noRice)) {
+            $logWritten = true;
+
             $attacker->logBattleResult();
             $defender->logBattleResult();
 
@@ -393,6 +398,7 @@ function processWar_NG(
         }
 
         if (!$defender->continueWar($noRice)) {
+            $logWritten = true;
 
             $attacker->logBattleResult();
             $defender->logBattleResult();
@@ -434,7 +440,7 @@ function processWar_NG(
         }
     }
 
-    if ($attacker->getPhase() >= $attacker->getMaxPhase()) {
+    if (!$logWritten) {
         //마지막 페이즈의 전투 마무리
         $attacker->logBattleResult();
         $defender->logBattleResult();