From 720fe3a6effa9d15072f8658b80309f0cf5a94be Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 12 Sep 2021 20:08:44 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20inheritSkill=20=EC=97=B0=EC=82=B0?=
 =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=B4=20aux=20=ED=95=84=EC=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_gamerule.php | 2 +-
 hwe/sammo/General.php | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index a6faafe4..80ff03d0 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -623,7 +623,7 @@ function updateNationState()
                     $nation['nation'],
                     $targetKillTurn
                 );
-                $nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong', 'npc'], 2);
+                $nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong', 'npc', 'aux'], 2);
                 $chiefObj = null;
 
                 $uniqueLotteryWeightList = [];
diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php
index ea58e4ff..b8ebd788 100644
--- a/hwe/sammo/General.php
+++ b/hwe/sammo/General.php
@@ -139,9 +139,11 @@ class General implements iAction{
         $this->itemObjs['book'] = buildItemClass($raw['book']);
         $this->itemObjs['item'] = buildItemClass($raw['item']);
 
-        $rawInheritBuff = $this->getAuxVar('inheritBuff');
-        if($rawInheritBuff !== null){
-            $this->inheritBuffObj = new TriggerInheritBuff($rawInheritBuff);
+        if(key_exists('aux', $this->raw)){
+            $rawInheritBuff = $this->getAuxVar('inheritBuff');
+            if($rawInheritBuff !== null){
+                $this->inheritBuffObj = new TriggerInheritBuff($rawInheritBuff);
+            }
         }
     }