From af2dec7e2c3dc0b13be57cfd6d3593682ad376c4 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sun, 11 Jun 2023 21:27:14 +0900 Subject: [PATCH] =?UTF-8?q?refac:=20=ED=84=B4=EC=8B=9C=EA=B0=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=9D=BD=20=EB=AC=B4=EC=8B=9C?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/ServerTool.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hwe/sammo/ServerTool.php b/hwe/sammo/ServerTool.php index dc1cf690..3188b3f7 100644 --- a/hwe/sammo/ServerTool.php +++ b/hwe/sammo/ServerTool.php @@ -8,7 +8,7 @@ final class ServerTool { } - public static function changeServerTerm(int $turnterm): ?string + public static function changeServerTerm(int $turnterm, ?bool $ignoreLock = null): ?string { // 하루에 연 단위로 게임 시간이 흘러야 함. if ((120 % $turnterm) != 0) { @@ -20,7 +20,7 @@ final class ServerTool $gameStor = KVStorage::getStorage($db, 'game_env'); $admin = $gameStor->getValues(['turntime', 'turnterm', 'year', 'startyear', 'month', 'isunited']); - $reqGameLock = $admin['isunited'] != 2; + $reqGameLock = $admin['isunited'] != 2 && !$ignoreLock; $locked = false; if($reqGameLock){