From 29984d4b09f91c4fdfb9b7ca820366e30a82b9ff Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 3 Oct 2018 22:41:49 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=82=9C=20=ED=84=B4=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20=EB=B6=80=EB=B6=84=20=EC=9D=B4=EC=83=81=ED=95=9C=20?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/TurnExecutionHelper.php | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/hwe/sammo/TurnExecutionHelper.php b/hwe/sammo/TurnExecutionHelper.php
index 6251ba56..cac6e186 100644
--- a/hwe/sammo/TurnExecutionHelper.php
+++ b/hwe/sammo/TurnExecutionHelper.php
@@ -8,13 +8,10 @@ class TurnExecutionHelper
      * @var General $generalObj;
      */
     protected $generalObj;
-    protected $turn = null;
-    protected $nationTurn = null;
 
     public function __construct(array $rawGeneral, int $year, int $month)
     {
         $this->generalObj = new General($rawGeneral, null, $year, $month);
-        $this->turn = $turn;
         $this->nationTurn = $nationTurn;
     }
 
@@ -119,18 +116,7 @@ class TurnExecutionHelper
         }
 
         $general->clearActivatedSkill();
-        return $general->getResultTurn();
-    }
 
-    function updateTurnTime($commandClassName){
-        $db = DB::db();
-        $gameStor = KVStorage::getStorage($db, 'game_env');
-
-        $general = $this->getGeneral();
-        $generalID = $general->getRaw('no');
-        $logger = $general->getLogger();
-
-        $generalName = $general->getName();
         $killTurn = $gameStor->killturn;
 
         if($general->getVar('npc') >= 2){
@@ -146,6 +132,19 @@ class TurnExecutionHelper
             $general->setVar('killturn', $killTurn);
         }
 
+        return $general->getResultTurn();
+    }
+
+    function updateTurnTime(){
+        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+
+        $general = $this->getGeneral();
+        $generalID = $general->getRaw('no');
+        $logger = $general->getLogger();
+
+        $generalName = $general->getName();
+
         // 삭턴장수 삭제처리
         if($general->getVar('killturn') <= 0){
             // npc유저 삭턴시 npc로 전환
@@ -234,7 +233,7 @@ WHERE turntime < %s ORDER BY turntime ASC, `no` ASC',
                 $hasNationTurn = true;
             }
 
-            $turnObj = new static($generalWork, $turn, $nationTurn, $year, $month);
+            $turnObj = new static($generalWork, $year, $month);
             if(!$turnObj->processBlocked()){
                 $turnObj->preprocessCommand();
                 if($hasNationTurn){