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); + } } }