From 433c4abb867d2580b558c97747628197fd305e7b Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 11 Apr 2021 23:17:47 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9D=B4=EB=AF=BC=EC=A1=B1=20=EC=A2=85?= =?UTF-8?q?=EB=A3=8C=20=EC=8B=9C=EC=A0=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/Event/Action/InvaderEnding.php | 3 --- hwe/sammo/TurnExecutionHelper.php | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hwe/sammo/Event/Action/InvaderEnding.php b/hwe/sammo/Event/Action/InvaderEnding.php index 7c0db69a..d39bd9c5 100644 --- a/hwe/sammo/Event/Action/InvaderEnding.php +++ b/hwe/sammo/Event/Action/InvaderEnding.php @@ -51,9 +51,6 @@ class InvaderEnding extends \sammo\Event\Action{ $logger->flush(); $gameStor->conlimit = $gameStor->conlimit * 100; - $db->update('plock', [ - 'plock' => 1 - ], true); $eventID = Util::array_get($env['currentEventID']); $db->delete('event', 'id = %i', $eventID); diff --git a/hwe/sammo/TurnExecutionHelper.php b/hwe/sammo/TurnExecutionHelper.php index 08ed7bc0..50d051d7 100644 --- a/hwe/sammo/TurnExecutionHelper.php +++ b/hwe/sammo/TurnExecutionHelper.php @@ -321,7 +321,7 @@ class TurnExecutionHelper return; } - if ($gameStor->isunited == 2) { + if ($gameStor->isunited == 2 || $gameStor->isunited == 3) { //천통시에는 동결 return; }