From ffbf2d0a936d847ec17eb728c79b52981e73ab72 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 25 Jan 2019 20:30:02 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=81=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=EC=8B=9C=20permission=20=EC=B4=88=EA=B8=B0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/c_myBossInfo.php  | 1 +
 hwe/c_vacation.php    | 4 +++-
 hwe/func.php          | 1 +
 hwe/func_gamerule.php | 2 ++
 hwe/j_select_npc.php  | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php
index bbfaa219..7dd2073b 100644
--- a/hwe/c_myBossInfo.php
+++ b/hwe/c_myBossInfo.php
@@ -150,6 +150,7 @@ if($btn == "추방") {
                     'level'=>0,
                     'nation'=>0,
                     'belong'=>0,
+                    'permission'=>'normal',
                 ], 'no=%i', $general['no']);
             }
             else{
diff --git a/hwe/c_vacation.php b/hwe/c_vacation.php
index e93dfb3a..8c825335 100644
--- a/hwe/c_vacation.php
+++ b/hwe/c_vacation.php
@@ -12,7 +12,9 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 $killturn = $gameStor->killturn;
 
-$db->update('general', ['killturn'=>$killturn*3], 'owner=%i', $userID);
+$db->update('general', [
+    'killturn'=>$killturn*3,
+], 'owner=%i', $userID);
 
 
 header('location:b_myPage.php');
diff --git a/hwe/func.php b/hwe/func.php
index 3cc90380..112e9058 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1953,6 +1953,7 @@ function updateTurntime($no) {
                 'npc'=>$general['npc_org'],
                 'killturn'=>$general['killturn'],
                 'mode'=>2,
+                'permission'=>'normal',
                 'name2'=>null
             ], 'no=%i',$no);
 
diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index c1490d19..ffff8e60 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -776,6 +776,7 @@ function checkMerge() {
 
         $db->update('general', [
             'nation'=>0,
+            'permission'=>'normal',
         ], 'nation=%i AND npc = 5', $me['nation']);
 
         $query = "delete from nation where nation='{$me['nation']}'";
@@ -922,6 +923,7 @@ function checkSurrender() {
 
         $db->update('general', [
             'nation'=>0,
+            'permission'=>'normal',
         ], 'nation=%i AND npc = 5', $me['nation']);
 
         $query = "delete from nation where nation='{$me['nation']}'";
diff --git a/hwe/j_select_npc.php b/hwe/j_select_npc.php
index 9d57a066..3909a753 100644
--- a/hwe/j_select_npc.php
+++ b/hwe/j_select_npc.php
@@ -77,6 +77,7 @@ $db->update('general', [
     'npc'=>1,
     'killturn'=>6,
     'mode'=>2,
+    'permission'=>'normal',
     'owner'=>$userID,
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);