From b6dc0e08c2511279a3861eca9af60541cf02b7ed Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 10 Aug 2021 18:47:17 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20-=20?=
 =?UTF-8?q?=ED=83=9C=EC=88=98=EA=B5=AD=EC=97=90=20=EC=9E=84=EA=B4=80?=
 =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?-=20NPC=EA=B5=AD=20=EA=B5=AD=EA=B0=80=20=EB=A0=88=EB=B2=A8=20?=
 =?UTF-8?q?=EC=83=81=EC=8A=B9=EC=8B=9C=20=EB=B2=84=EA=B7=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_gamerule.php                      | 4 +++-
 hwe/sammo/Command/General/che_랜덤임관.php | 4 ++--
 hwe/sammo/General.php                      | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index bdebf3a7..d289fa63 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -670,7 +670,9 @@ function updateNationState()
                     $winnerObj->applyDB($db);
                 }
 
-                $chiefObj->increaseInheritancePoint('unifier', 250 * $levelDiff);
+                if($chiefObj){
+                    $chiefObj->increaseInheritancePoint('unifier', 250 * $levelDiff);
+                }
             }
         }
 
diff --git a/hwe/sammo/Command/General/che_랜덤임관.php b/hwe/sammo/Command/General/che_랜덤임관.php
index e0dd31f9..2e9f202e 100644
--- a/hwe/sammo/Command/General/che_랜덤임관.php
+++ b/hwe/sammo/Command/General/che_랜덤임관.php
@@ -178,14 +178,14 @@ class che_랜덤임관 extends Command\GeneralCommand{
             $generalsCnt = [];
             if($notIn){
                 $rawGeneralsCnt = $db->query(
-                    'SELECT general.nation as nation, nation.gennum, nation.name, npc, count(*) as cnt FROM general JOIN nation ON general.nation = nation.nation WHERE npc < 4 AND nation.gennum < %i AND nation.scout=0 AND nation.nation NOT IN %li GROUP BY general.nation, general.npc',
+                    'SELECT general.nation as nation, nation.gennum, nation.name, npc, count(*) as cnt FROM general JOIN nation ON general.nation = nation.nation WHERE npc != 9 AND nation.gennum < %i AND nation.scout=0 AND nation.nation NOT IN %li GROUP BY general.nation, general.npc',
                     $genLimit,
                     $notIn
                 );
             }
             else{
                 $rawGeneralsCnt = $db->query(
-                    'SELECT general.nation as nation, nation.gennum, nation.name, npc, count(*) as cnt FROM general JOIN nation ON general.nation = nation.nation WHERE npc < 4 AND nation.gennum < %i AND nation.scout=0 GROUP BY general.nation, general.npc',
+                    'SELECT general.nation as nation, nation.gennum, nation.name, npc, count(*) as cnt FROM general JOIN nation ON general.nation = nation.nation WHERE npc != 9  AND nation.gennum < %i AND nation.scout=0 GROUP BY general.nation, general.npc',
                     $genLimit
                 );
             }
diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php
index 2d1b15fc..e1e62739 100644
--- a/hwe/sammo/General.php
+++ b/hwe/sammo/General.php
@@ -941,19 +941,19 @@ class General implements iAction{
     static public function mergeQueryColumn(?array $reqColumns=null, int $constructMode=2):array{
         $minimumColumn = ['no', 'name', 'city', 'nation', 'officer_level', 'officer_city'];
         $defaultEventColumn = [
-            'no', 'name', 'city', 'nation', 'officer_level', 'officer_city',
+            'no', 'name', 'owner', 'city', 'nation', 'officer_level', 'officer_city',
             'special', 'special2', 'personal',
             'horse', 'weapon', 'book', 'item', 'last_turn'
         ];
         $fullColumn = [
-            'no', 'name', 'owner_name', 'picture', 'imgsvr', 'nation', 'city', 'troop', 'injury', 'affinity', 
+            'no', 'name', 'owner', 'owner_name', 'picture', 'imgsvr', 'nation', 'city', 'troop', 'injury', 'affinity', 
             'leadership', 'leadership_exp', 'strength', 'strength_exp', 'intel', 'intel_exp', 'weapon', 'book', 'horse', 'item', 
             'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'crew', 'crewtype', 'train', 'atmos', 'turntime',
             'makelimit', 'killturn', 'block', 'dedlevel', 'explevel', 'age', 'startage', 'belong',
             'personal', 'special', 'special2', 'defence_train', 'tnmt', 'npc', 'npc_org', 'deadyear', 'npcmsg',
             'dex1', 'dex2', 'dex3', 'dex4', 'dex5', 'betray',
             'recent_war', 'last_turn', 'myset',
-            'specage', 'specage2', 'con', 'connect', 'owner', 'aux', 'lastrefresh',
+            'specage', 'specage2', 'con', 'connect', 'aux', 'lastrefresh',
         ];
 
         if($reqColumns === null){