From 4de010cb1e28571fb23d9775948d512e6a047f32 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 15 Dec 2021 02:15:38 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B9=99=EC=9D=98=20=EC=9E=A5=EC=88=98?=
 =?UTF-8?q?=EC=9D=98=20=EC=9C=A0=EC=82=B0=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?-=20=EB=B9=99=EC=9D=98=EC=9E=A5=EC=9D=98=20=EC=9C=A0=EC=82=B0?=
 =?UTF-8?q?=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=EA=B0=80=20=EC=B2=9C=ED=86=B5?=
 =?UTF-8?q?=EC=8B=9C=EC=97=94=20=EB=AF=B8=EC=A0=81=EC=9A=A9.=20-=20NPC=20?=
 =?UTF-8?q?=EC=8B=9C=EC=A0=88=20=EB=B2=A0=ED=8C=85=20=EA=B2=B0=EA=B3=BC?=
 =?UTF-8?q?=EA=B0=80=20=EB=B0=98=EC=98=81=EB=90=98=EB=8A=94=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=20=20-=20=EB=B2=A0=ED=8C=85=ED=9A=9F=EC=88=98+0,?=
 =?UTF-8?q?=20=EB=B2=A0=ED=8C=85=EC=84=B1=EA=B3=B5+1,=20=EB=B2=A0=ED=8C=85?=
 =?UTF-8?q?=EA=B8=88=EC=95=A1+=20=EB=AC=B8=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_gamerule.php   | 2 +-
 hwe/func_tournament.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index 3035a7bb..b97d230c 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -1022,7 +1022,7 @@ function checkEmperior()
     $nationLogger = new ActionLogger(0, $nationID, $admin['year'], $admin['month']);
     $nationLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>{$josaYi} 전토를 통일");
 
-    foreach (General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj) {
+    foreach (General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2')) as $genObj) {
         if ($genObj->getNationID() == $nationID) {
             if ($genObj->getVar('officer_level') > 4) {
                 $genObj->increaseInheritancePoint('unifier', 2000);
diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php
index 0c1c1f8f..8b2e8fd4 100644
--- a/hwe/func_tournament.php
+++ b/hwe/func_tournament.php
@@ -858,8 +858,10 @@ function setGift($tnmt_type, $tnmt, $phase) {
     foreach(General::createGeneralObjListFromDB(Util::squeezeFromArray($gambleResult, 'general_id'), ['gold'], 1) as $gambler){
         $reward = Util::round($gambleResult[$gambler->getID()]['bet'] * $rewardRate);
         $gambler->increaseVar('gold', $reward);
-        $gambler->increaseRankVar('betwingold', $reward);
-        $gambler->increaseRankVar('betwin', 1);
+        if(($gambler->getNPCType() == 0) || ($gambler->getNPCType()==1 && $gambler->getRankVar('betgold') > 0)){
+            $gambler->increaseRankVar('betwingold', $reward);
+            $gambler->increaseRankVar('betwin', 1);
+        }
         $rewardText = number_format($reward);
         $gambler->getLogger()->pushGeneralActionLog("<C>{$tp}</> 대회의 베팅 당첨으로 <C>{$rewardText}</>의 <S>금</> 획득!", ActionLogger::EVENT_PLAIN);
         $gambler->applyDB($db);