From 63ea8500b6d3a6c96852527ccf4821bd7cd57864 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 4 Sep 2018 15:48:18 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=ED=95=A9=20=EC=95=88=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/sammo/DiplomaticMessage.php | 4 ++--
 hwe/sammo/Engine/Diplomacy.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index 9c065ada..7464ed30 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -181,7 +181,7 @@ class DiplomaticMessage extends Message{
         $josaWa = JosaUtil::pick($this->src->nationName, '와');
         pushGeneralHistory(
             ['no'=>$this->dest->generalID],
-            ["<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->src->nationName}</b></>{$josaWa} 통합 시도"]
+            "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->src->nationName}</b></>{$josaWa} 통합 시도"
         );
         pushGenLog(
             ['no'=>$this->dest->generalID],
@@ -200,7 +200,7 @@ class DiplomaticMessage extends Message{
         $josaWa = JosaUtil::pick($this->dest->nationName, '와');
         pushGeneralHistory(
             ['no'=>$this->src->generalID],
-            ["<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>{$josaWa} 통합 시도"]
+            "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>{$josaWa} 통합 시도"
         );
         $josaYi = JosaUtil::pick($this->dest->nationName, '이');
         pushGenLog(
diff --git a/hwe/sammo/Engine/Diplomacy.php b/hwe/sammo/Engine/Diplomacy.php
index 54ba46f2..29f418a0 100644
--- a/hwe/sammo/Engine/Diplomacy.php
+++ b/hwe/sammo/Engine/Diplomacy.php
@@ -29,12 +29,12 @@ class Diplomacy{
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $srcNation = $db->queryFirstRow(
-            'SELECT nation, `name`, `power`, capital, gold, rice, surlimit, color, `level` FROM nation WHERE nation=%i',
+            'SELECT nation, `name`, `power`, capital, gold, rice, gennum, surlimit, color, `level` FROM nation WHERE nation=%i',
             $srcNationID
         );
 
         $destNation = $db->queryFirstRow(
-            'SELECT nation, `name`, `power`, capital, gold, rice, surlimit, color, `level` FROM nation WHERE nation=%i',
+            'SELECT nation, `name`, `power`, capital, gold, rice, gennum, surlimit, color, `level` FROM nation WHERE nation=%i',
             $destNationID
         );