From a02454e2b4f8b7c38dce383bcffc1f4d6d398456 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 30 Sep 2018 03:07:24 +0900
Subject: [PATCH] =?UTF-8?q?command=EB=A1=9C=20=EC=83=88=20table=EC=9A=A9?=
 =?UTF-8?q?=20=EC=9E=A5=EC=88=98,=20=EC=88=98=EB=87=8C=20=ED=84=B4=20?=
 =?UTF-8?q?=EB=8B=B9=EA=B8=B0=EA=B8=B0,=EB=B0=80=EA=B8=B0=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_command.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hwe/func_command.php b/hwe/func_command.php
index b9096e33..be52db19 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -676,12 +676,12 @@ function pushNationCommand(int $nationID, int $level, int $turnCnt=1){
 
     $db->update('general_turn', [
         'turn_idx'=>$db->sqleval('turn_idx + %i', $turnCnt)
-    ], 'general_id=%i', $generalID);
+    ], 'nation_id=%i AND level=%i', $nationID, $level);
     $db->update('general_turn', [
         'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxNationTurn),
         'action'=>'휴식',
         'arg'=>'{}'
-    ], 'general_id=%i AND turn_idx >= %i', $generalID, GameConst::$maxNationTurn);
+    ], 'nation_id=%i AND level=%i AND turn_idx >= %i', $nationID, $level, GameConst::$maxNationTurn);
 }
 
 function pullNationCommand(int $nationID, int $level, int $turnCnt=1){
@@ -701,10 +701,10 @@ function pullNationCommand(int $nationID, int $level, int $turnCnt=1){
         'turn_idx'=>$db->sqleval('turn_idx + %i', GameConst::$maxNationTurn),
         'action'=>'휴식',
         'arg'=>'{}'
-    ], 'nation_id=%i AND turn_idx < %i', $generalID, $turnCnt);
+    ], 'nation_id=%i AND level=%i AND turn_idx < %i', $nationID, $level, $turnCnt);
     $db->update('general_turn', [
         'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt)
-    ], 'nation_id=%i', $generalID);
+    ], 'nation_id=%i AND level=%i', $nationID, $level);
 }
 
 function updateCommand($no, $type=0) {