From 5bdf7ba31640c9ea443fc370c51fa2fa171f18d5 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 13 Aug 2019 02:24:58 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=80=EC=98=A4=ED=94=88=EC=8B=9C=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=EB=8A=94=20=EC=9C=A0=EC=A0=80=EC=9E=A5?=
 =?UTF-8?q?=EB=A7=8C=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_myPage.php          |  9 ++++++---
 hwe/c_die_immediately.php | 32 +++++++-------------------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php
index 86604c68..885f5663 100644
--- a/hwe/b_myPage.php
+++ b/hwe/b_myPage.php
@@ -96,9 +96,12 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
 
 if($gameStor->turntime <= $gameStor->opentime){
     //서버 가오픈시 할 수 있는 행동
-    $showDieImmediatelyBtn = true;
-    if(addTurn($me['lastrefresh'], $gameStor->turnterm, 2) <= TimeUtil::DatetimeNow()){
-        $availableDieImmediately = true;
+
+    if($me['npc'] == 0){
+        $showDieImmediatelyBtn = true;
+        if(addTurn($me['lastrefresh'], $gameStor->turnterm, 2) <= TimeUtil::DatetimeNow()){
+            $availableDieImmediately = true;
+        }
     }
 }
 ?>
diff --git a/hwe/c_die_immediately.php b/hwe/c_die_immediately.php
index de600f30..c858889c 100644
--- a/hwe/c_die_immediately.php
+++ b/hwe/c_die_immediately.php
@@ -13,7 +13,7 @@ $userID = Session::getUserID();
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
-$general = $db->queryFirstRow('SELECT no,name,name2,npc,lastrefresh FROM general WHERE owner=%i', $userID);
+$general = $db->queryFirstRow('SELECT no,name,name2,npc,lastrefresh FROM general WHERE owner=%i AND npc = 0', $userID);
 
 if(!$general){
     header('location:b_myPage.php');
@@ -36,31 +36,13 @@ if(!$availableDieImmediately){
 }
 
 
-if($general['npc'] == 0){
-    if(!$db->query('DELETE FROM general WHERE owner=%i AND npc=0', $userID)){
-        trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
-    }
-    $generalName = $general['name'];
-    $josaYi = JosaUtil::pick($generalName, '이');
-    pushGeneralPublicRecord(["<C>●</>{$gameStor->month}월:<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>"], $gameStor->year, $gameStor->month);
-}
-else{
-    $turnterm = $gameStor->turnterm;
-    if($turnterm < 10){
-        $targetKillTurn = 30 / $turnterm;
-    }
-    else{
-        $targetKillTurn = 60 / $turnterm;
-    }
-    if(!$db->update('general', [
-        'killturn'=>$targetKillTurn
-    ], 'owner=%i AND npc=1', $userID)){
-        trigger_error("올바르지 않은 빙의 해제 프로세스 $userID", E_USER_WARNING);
-    }
-    $generalName = $general['name2'];
-    $josaYi = JosaUtil::pick($generalName, '이');
-    pushGeneralPublicRecord(["<C>●</>{$gameStor->month}월:<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>"], $gameStor->year, $gameStor->month);
+if(!$db->query('DELETE FROM general WHERE owner=%i AND npc=0', $userID)){
+    trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
 }
+$generalName = $general['name'];
+$josaYi = JosaUtil::pick($generalName, '이');
+pushGeneralPublicRecord(["<C>●</>{$gameStor->month}월:<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>"], $gameStor->year, $gameStor->month);
+
 
 
 $session->logoutGame();