From 1d6378c1fce363b4760301637b0356d61439064a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 6 May 2020 09:01:40 +0900
Subject: [PATCH] =?UTF-8?q?=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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/process_war.php b/hwe/process_war.php
index fbc946b4..0b369f67 100644
--- a/hwe/process_war.php
+++ b/hwe/process_war.php
@@ -505,7 +505,7 @@ function ConquerCity(array $admin, General $general, array $city) {
     $attackerLogger->pushGlobalHistoryLog("<S><b>【지배】</b></><D><b>{$attackerNationName}</b></>{$josaYiNation} <G><b>{$cityName}</b></>{$josaUl} 지배했습니다.");
     $attackerLogger->pushNationalHistoryLog("<Y>{$attackerGeneralName}</>{$josaYiGen} {$defenderNationDecoration} <G><b>{$cityName}</b></> {$josaUl} <S>점령</>");
 
-    $defenderNationLogger->pushNationalHistoryLog("<D><b>{$attackerNationName}</b></>의 <Y>{$general['name']}</>에 의해 <G><b>{$cityName}</b></>{$josaYiCity} <O>함락</>");
+    $defenderNationLogger->pushNationalHistoryLog("<D><b>{$attackerNationName}</b></>의 <Y>{$attackerGeneralName}</>에 의해 <G><b>{$cityName}</b></>{$josaYiCity} <O>함락</>");
 
     // 국가 멸망시
     if($defenderNationID && $db->queryFirstField('SELECT count(city) FROM city WHERE nation = %i', $defenderNationID) === 1) {
@@ -654,7 +654,7 @@ function ConquerCity(array $admin, General $general, array $city) {
         // 이동
         $db->update('general', [
             'city'=>$cityID
-        ], 'no=%i', $general['no']);
+        ], 'no=%i', $attackerID);
     }
     else{
         $conquerNationName = getNationStaticInfo($conquerNation)['name'];