From aafe6d8863a7c5cb72996c1cb58d4980f7abeb09 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 27 Jun 2018 03:43:01 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B2=9C=ED=86=B5=EC=8B=9C=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=EB=90=98=EB=8A=94=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_gamerule.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index c8a19703..de2562da 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -1331,7 +1331,7 @@ function checkEmperior() {
     $statGeneral = MYDB_fetch_array($result);
 
     $oldNation = $db->queryFirstRow('SELECT * FROM nation WHERE nation=%i', $nation['nation']);
-    $oldNation['generals'] = $db->query('SELECT * FROM general WHERE nation=%i', $nation['nation']);
+    $oldNation['generals'] = $db->queryFirstColumn('SELECT `no` FROM general WHERE nation=%i', $nation['nation']);
 
     storeOldGenerals(0, $admin['year'], $admin['month']);
     storeOldGenerals($nation['nation'], $admin['year'], $admin['month']);
@@ -1339,6 +1339,7 @@ function checkEmperior() {
     $db->insert('ng_old_nations', [
         'server_id'=>UniqueConst::$serverID,
         'nation'=>$nation['nation'],
+        'history'=>'',
         'data'=>Json::encode($oldNation)
     ]);
 
@@ -1346,7 +1347,11 @@ function checkEmperior() {
     $db->insert('ng_old_nations', [
         'server_id'=>UniqueConst::$serverID,
         'nation'=>0,
-        'data'=>Json::encode($noNationGeneral)
+        'data'=>Json::encode([
+            'nation'=>0,
+            'name'=>'재야',
+            'generals'=>$noNationGeneral
+        ])
     ]);
 
     $nationHistory = DB::db()->queryFirstField('SELECT `history` FROM `nation` WHERE `nation` = %i', $nation['nation']);