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