From 926d96732de7353ddb69f3aa6196ac16be23afb6 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 23 Mar 2021 13:24:34 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B0=80=EC=83=81=20=EC=97=AD=EC=82=AC?=
 =?UTF-8?q?=20=EB=AA=A8=EB=93=9C=EC=97=90=EC=84=9C=20=ED=9B=84=EA=B3=84?=
 =?UTF-8?q?=EC=9E=90=20=EC=A7=80=EC=A0=95=EC=9D=B4=20=EC=82=AC=EC=8B=A4=20?=
 =?UTF-8?q?=EB=AA=A8=EB=93=9C=20=EC=84=A4=EC=A0=95=EC=9D=84=20=EB=94=B0?=
 =?UTF-8?q?=EB=9D=BC=EA=B0=80=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index 5489552e..dc29955e 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1736,7 +1736,7 @@ function nextRuler(General $general)
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+    [$year, $month, $fiction] = $gameStor->getValuesAsArray(['year', 'month', 'fiction']);
     $nation = $general->getStaticNation();
     $nationName = $nation['name'];
     $nationID = $nation['nation'];
@@ -1744,7 +1744,7 @@ function nextRuler(General $general)
     $candidate = null;
 
     //npc or npc유저인 경우 후계 찾기
-    if ($general->getNPCType() > 0) {
+    if (!$fiction && $general->getNPCType() > 0) {
         $candidate = $db->queryFirstRow(
             'SELECT no,name,officer_level,IF(ABS(affinity-%i)>75,150-ABS(affinity-%i),ABS(affinity-%i)) as npcmatch2 from general where nation=%i and officer_level!=12 and 1 <= npc and npc<=3 order by npcmatch2,rand() LIMIT 1',
             $general->getVar('affinity'),