From 279478c15b4c906eaa9944702f3aa177d6220e5c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 12 Apr 2018 02:18:35 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=B0=9C?=
 =?UTF-8?q?=EB=B6=80=EC=8B=9C=20=EA=B5=AD=EA=B0=80=EB=AA=85=20=EB=B9=BC?=
 =?UTF-8?q?=EB=A8=B9=EC=9D=80=20=EA=B2=83=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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/process_war.php b/hwe/process_war.php
index 3f83a21d..3f902e1b 100644
--- a/hwe/process_war.php
+++ b/hwe/process_war.php
@@ -1767,7 +1767,7 @@ function ConquerCity($game, $general, $city, $nation, $destnation) {
         $history[] = "<C>●</>{$year}년 {$month}월:<R><b>【멸망】</b></><D><b>{$losenation['name']}</b></>(이)가 멸망하였습니다.";
         pushNationHistory($nation, "<C>●</>{$year}년 {$month}월:<D><b>{$losenation['name']}</b></>(을)를 정복");
 
-        $query = "select no from general where nation='{$general['nation']}' and level='12'";
+        $query = "select no, nation from general where nation='{$general['nation']}' and level='12'";
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $ruler = MYDB_fetch_array($result);