diff --git a/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php b/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php index 3891849..279e591 100644 --- a/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php +++ b/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php @@ -8,11 +8,8 @@ namespace VectorNetworkProject\TheMix\event\block; -use InkoHX\GoldLibrary\GoldAPI; -use InkoHX\LeveLibrary\LevelAPI; use pocketmine\event\block\BlockBreakEvent; use pocketmine\event\Listener; -use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; use pocketmine\Server; use VectorNetworkProject\TheMix\event\game\TheEndGameEvent; use VectorNetworkProject\TheMix\game\corepvp\blue\BlueCoreManager; @@ -21,7 +18,6 @@ use VectorNetworkProject\TheMix\game\corepvp\red\RedTeamManager; use VectorNetworkProject\TheMix\game\DefaultConfig; use VectorNetworkProject\TheMix\game\event\game\BreakCoreEvent; -use VectorNetworkProject\TheMix\lib\sound\LevelSounds; class TheBlockBreakEvent implements Listener { @@ -48,7 +44,9 @@ public function event(BlockBreakEvent $event) if (!DefaultConfig::isDev()) { if (RedCoreManager::isCore($block)) { $event->setCancelled(); - if (RedTeamManager::isJoined($player)) return; + if (RedTeamManager::isJoined($player)) { + return; + } $revent = new BreakCoreEvent($player, BreakCoreEvent::RED); $revent->call(); if (!$revent->isCancelled()) { @@ -56,7 +54,9 @@ public function event(BlockBreakEvent $event) } } elseif (BlueCoreManager::isCore($block)) { $event->setCancelled(); - if (BlueTeamManager::isJoined($player)) return; + if (BlueTeamManager::isJoined($player)) { + return; + } $bevent = new BreakCoreEvent($player, BreakCoreEvent::BLUE); $bevent->call(); if (!$bevent->isCancelled()) { diff --git a/src/VectorNetworkProject/TheMix/event/game/TheBreakCoreEvent.php b/src/VectorNetworkProject/TheMix/event/game/TheBreakCoreEvent.php index e30ef39..e6332ce 100644 --- a/src/VectorNetworkProject/TheMix/event/game/TheBreakCoreEvent.php +++ b/src/VectorNetworkProject/TheMix/event/game/TheBreakCoreEvent.php @@ -10,7 +10,7 @@ * Created by PhpStorm. * User: InkoHX * Date: 2018/12/17 - * Time: 23:59 + * Time: 23:59. */ namespace VectorNetworkProject\TheMix\event\game; @@ -29,6 +29,7 @@ class TheBreakCoreEvent implements Listener { /** * @param BreakCoreEvent $event + * * @throws \ErrorException */ public function event(BreakCoreEvent $event) @@ -37,6 +38,7 @@ public function event(BreakCoreEvent $event) if (RedTeamManager::getListCount() < 1 || BlueTeamManager::getListCount() < 1) { $player->sendMessage(TextFormat::RED.'プレイヤーが足りないのでコアを破壊する事が出来ません。'); $event->setCancelled(); + return; } switch ($event->getTeam()) { diff --git a/src/VectorNetworkProject/TheMix/game/event/game/PhaseTimeUpdateEvent.php b/src/VectorNetworkProject/TheMix/game/event/game/PhaseTimeUpdateEvent.php index 50404b1..f2dfffb 100644 --- a/src/VectorNetworkProject/TheMix/game/event/game/PhaseTimeUpdateEvent.php +++ b/src/VectorNetworkProject/TheMix/game/event/game/PhaseTimeUpdateEvent.php @@ -8,7 +8,6 @@ namespace VectorNetworkProject\TheMix\game\event\game; - use pocketmine\event\Cancellable; use pocketmine\event\Event; diff --git a/src/VectorNetworkProject/TheMix/game/event/game/PhaseUpdateEvent.php b/src/VectorNetworkProject/TheMix/game/event/game/PhaseUpdateEvent.php index db15a81..985aed2 100644 --- a/src/VectorNetworkProject/TheMix/game/event/game/PhaseUpdateEvent.php +++ b/src/VectorNetworkProject/TheMix/game/event/game/PhaseUpdateEvent.php @@ -8,7 +8,6 @@ namespace VectorNetworkProject\TheMix\game\event\game; - use pocketmine\event\Cancellable; use pocketmine\event\Event;