From bb54d732d0fb38af3eda03333f3404a76320cbb1 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 25 Jan 2019 19:46:32 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EB=9D=BD=20=EB=B6=88=EA=B0=80?=
 =?UTF-8?q?=EB=8A=A5=ED=95=9C=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/DiplomaticMessage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index 9541072e..183d2e0a 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -64,7 +64,7 @@ class DiplomaticMessage extends Message{
             return [self::INVALID, '송신자가 외교서신을 처리할 수 없습니다.'];
         }
 
-        $permission = checkSecretPermission($general);
+        $permission = checkSecretPermission($general, false);
 
         if(!$general || $permission < 4){
             return [self::INVALID, '해당 국가의 외교권자 아닙니다.'];
@@ -273,7 +273,7 @@ class DiplomaticMessage extends Message{
         $gameStor = KVStorage::getStorage($db, 'game_env');
 
         $general = $db->queryFirstRow(
-            'SELECT `name`, `level`, `permission`, `penalty` FROM general WHERE `no`=%i AND nation=%i', 
+            'SELECT `name`, nation, `level`, `permission`, `penalty` FROM general WHERE `no`=%i AND nation=%i', 
             $receiverID, 
             $this->dest->nationID
         );