From 40a953aed5b77446a172e3e5846cb3abf7a130da Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 14 Jun 2018 01:49:15 +0900
Subject: [PATCH] =?UTF-8?q?storage=EC=9D=98=20isunited=20=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=20=EB=AC=B8=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php          | 8 ++++----
 hwe/func_gamerule.php | 6 +++---
 src/sammo/Session.php | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index 7458775f..d06cd876 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1540,7 +1540,7 @@ function checkTurn() {
     //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', 진입');
     
     //천통시에는 동결
-    if($gameStor->isUnited == 2) {
+    if($gameStor->isunited == 2) {
         $db->update('plock', ['plock'=>1], true);
         return;
     }
@@ -1901,7 +1901,7 @@ function updateTurntime($no) {
     $alllog = [];
     $log = [];
 
-    $admin = $gameStor->getValues(['year', 'month', 'isUnited', 'turnterm']);
+    $admin = $gameStor->getValues(['year', 'month', 'isunited', 'turnterm']);
 
     $query = "select no,name,name2,nation,troop,age,turntime,killturn,level,deadyear,npc,npc_org,affinity,npcid from general where no='$no'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1920,7 +1920,7 @@ function updateTurntime($no) {
             $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name2']}</>{$josaYi} <Y>{$general['name']}</>의 육체에서 <S>유체이탈</>합니다!";
             pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
 
-            if($admin['isUnited'] == 0) {
+            if($admin['isunited'] == 0) {
                 CheckHall($no);
             }
         } else {
@@ -2039,7 +2039,7 @@ function updateTurntime($no) {
     }
 
     if($general['age'] >= 80 && $general['npc'] == 0) {
-        if($admin['isUnited'] == 0) {
+        if($admin['isunited'] == 0) {
             CheckHall($no);
         }
 
diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index 7bdaa845..6622e207 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -1100,13 +1100,13 @@ function checkEmperior() {
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $admin = $gameStor->getValues(['year', 'month', 'isUnited']);
+    $admin = $gameStor->getValues(['year', 'month', 'isunited']);
 
     $query = "select nation,name from nation where level>0";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $count = MYDB_num_rows($result);
 
-    if($count == 1 && $admin['isUnited'] == 0) {
+    if($count == 1 && $admin['isunited'] == 0) {
         $nation = MYDB_fetch_array($result);
 
         $query = "select city from city where nation='{$nation['nation']}'";
@@ -1123,7 +1123,7 @@ function checkEmperior() {
 
             pushNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일");
 
-            $gameStor->isUnited = 2;
+            $gameStor->isunited = 2;
             $gameStor->conlimit = $gameStor->conlimit*100;
 
             $query = "select no from general where npc<2 and age>=45";
diff --git a/src/sammo/Session.php b/src/sammo/Session.php
index 7eb59398..8e90fe98 100644
--- a/src/sammo/Session.php
+++ b/src/sammo/Session.php
@@ -244,7 +244,7 @@ class Session
         }
         
         $turnterm = $gameStor->turnterm;
-        $isUnited = $gameStor->isUnited != 0;
+        $isUnited = $gameStor->isunited != 0;
 
         $generalID = $general['no'];
         $generalName = $general['name'];