diff --git a/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php b/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php index f4c2090..0cd1117 100644 --- a/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php +++ b/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php @@ -29,6 +29,7 @@ public function event(BlockBreakEvent $event) $block = $event->getBlock(); if (TheEndGameEvent::isFinish()) { $event->setCancelled(); + return; } if ($player->getLevel()->getName() === Server::getInstance()->getDefaultLevel()->getName()) { diff --git a/src/VectorNetworkProject/TheMix/event/block/TheBlockPlaceEvent.php b/src/VectorNetworkProject/TheMix/event/block/TheBlockPlaceEvent.php index 4919841..9fb23b9 100644 --- a/src/VectorNetworkProject/TheMix/event/block/TheBlockPlaceEvent.php +++ b/src/VectorNetworkProject/TheMix/event/block/TheBlockPlaceEvent.php @@ -21,6 +21,7 @@ public function event(BlockPlaceEvent $event) $player = $event->getPlayer(); if (TheEndGameEvent::isFinish()) { $event->setCancelled(); + return; } if ($player->getLevel()->getName() === Server::getInstance()->getDefaultLevel()->getName()) { @@ -29,7 +30,9 @@ public function event(BlockPlaceEvent $event) } $event->setCancelled(); } elseif ($player->getLevel()->getName() === DefaultConfig::getStageLevelName()) { - if (DefaultConfig::isDev()) return; + if (DefaultConfig::isDev()) { + return; + } $event->setCancelled(); } } diff --git a/src/VectorNetworkProject/TheMix/event/entity/TheEntityDamageEvent.php b/src/VectorNetworkProject/TheMix/event/entity/TheEntityDamageEvent.php index 602d446..b4d53b3 100644 --- a/src/VectorNetworkProject/TheMix/event/entity/TheEntityDamageEvent.php +++ b/src/VectorNetworkProject/TheMix/event/entity/TheEntityDamageEvent.php @@ -24,17 +24,27 @@ public function event(EntityDamageEvent $event) { $entity = $event->getEntity(); $entity->extinguish(); - if (TheEndGameEvent::isFinish()) return; - if (!$entity instanceof Player) return; - if ($event->getFinalDamage() < $entity->getHealth()) return; - if ($event->getCause() === EntityDamageEvent::CAUSE_FALL) return; + if (TheEndGameEvent::isFinish()) { + return; + } + if (!$entity instanceof Player) { + return; + } + if ($event->getFinalDamage() < $entity->getHealth()) { + return; + } + if ($event->getCause() === EntityDamageEvent::CAUSE_FALL) { + return; + } if ($event instanceof EntityDamageByEntityEvent) { $event->setCancelled(); SpawnManager::PlayerReSpawn($entity); Streak::resetStreak($entity); $damager = $event->getDamager(); if ($damager instanceof Player) { - if ($entity->getName() === $damager->getName()) return; + if ($entity->getName() === $damager->getName()) { + return; + } Streak::addStreak($damager); GoldAPI::addGold($damager, mt_rand(10, 15)); LevelAPI::Auto($damager, mt_rand(10, 15)); diff --git a/src/VectorNetworkProject/TheMix/event/game/TheEndGameEvent.php b/src/VectorNetworkProject/TheMix/event/game/TheEndGameEvent.php index 5d83fe1..c445ffb 100644 --- a/src/VectorNetworkProject/TheMix/event/game/TheEndGameEvent.php +++ b/src/VectorNetworkProject/TheMix/event/game/TheEndGameEvent.php @@ -10,7 +10,6 @@ use InkoHX\GoldLibrary\GoldAPI; use pocketmine\event\Listener; -use pocketmine\Player; use pocketmine\Server; use VectorNetworkProject\TheMix\game\corepvp\blue\BlueTeamManager; use VectorNetworkProject\TheMix\game\corepvp\red\RedTeamManager; @@ -33,7 +32,9 @@ public function event(GameWinEvent $event) } self::setFinish(true); foreach (Server::getInstance()->getOnlinePlayers() as $player) { - if ($player->getLevel()->getName() === DefaultConfig::getStageLevelName()) $player->setFlying(true); + if ($player->getLevel()->getName() === DefaultConfig::getStageLevelName()) { + $player->setFlying(true); + } $player->getInventory()->clearAll(); if ($event->getType() === GameWinEvent::WIN_RED) { if (RedTeamManager::isJoined($player)) { diff --git a/src/VectorNetworkProject/TheMix/event/game/ThePlayerStreakEvent.php b/src/VectorNetworkProject/TheMix/event/game/ThePlayerStreakEvent.php index 897c5b1..5c6cc51 100644 --- a/src/VectorNetworkProject/TheMix/event/game/ThePlayerStreakEvent.php +++ b/src/VectorNetworkProject/TheMix/event/game/ThePlayerStreakEvent.php @@ -8,7 +8,6 @@ namespace VectorNetworkProject\TheMix\event\game; - use pocketmine\event\Listener; use pocketmine\Player; use pocketmine\Server; @@ -43,7 +42,7 @@ public function event(PlayerStreakEvent $event) /** * @param Player $player - * @param int $count + * @param int $count */ private function getStreakMessage(Player $player, int $count): void { diff --git a/src/VectorNetworkProject/TheMix/event/level/TheLevelUpEvent.php b/src/VectorNetworkProject/TheMix/event/level/TheLevelUpEvent.php index 426dc0f..f782ac9 100644 --- a/src/VectorNetworkProject/TheMix/event/level/TheLevelUpEvent.php +++ b/src/VectorNetworkProject/TheMix/event/level/TheLevelUpEvent.php @@ -8,7 +8,6 @@ namespace VectorNetworkProject\TheMix\event\level; - use InkoHX\LeveLibrary\event\level\PlayerLevelUpEvent; use pocketmine\event\Listener; diff --git a/src/VectorNetworkProject/TheMix/game/event/player/PlayerStreakEvent.php b/src/VectorNetworkProject/TheMix/game/event/player/PlayerStreakEvent.php index 5eed235..1295d02 100644 --- a/src/VectorNetworkProject/TheMix/game/event/player/PlayerStreakEvent.php +++ b/src/VectorNetworkProject/TheMix/game/event/player/PlayerStreakEvent.php @@ -14,7 +14,7 @@ class PlayerStreakEvent extends PlayerEvent implements Cancellable { - /** @var int $count */ + /** @var int $count */ private $count; public function __construct(Player $player, int $count) diff --git a/src/VectorNetworkProject/TheMix/game/kit/BlueKit.php b/src/VectorNetworkProject/TheMix/game/kit/BlueKit.php index 21996e0..0410e81 100644 --- a/src/VectorNetworkProject/TheMix/game/kit/BlueKit.php +++ b/src/VectorNetworkProject/TheMix/game/kit/BlueKit.php @@ -8,7 +8,6 @@ namespace VectorNetworkProject\TheMix\game\kit; - use pocketmine\item\Armor; use pocketmine\item\Durable; use pocketmine\item\Item; @@ -20,17 +19,17 @@ class BlueKit public static function sendItems(Player $player): void { $armors = [ - "leather_cap" => Item::get(Item::LEATHER_CAP), - "leather_tunic" => Item::get(Item::LEATHER_TUNIC), - "leather_pants" => Item::get(Item::LEATHER_PANTS), - "leather_boots" => Item::get(Item::LEATHER_BOOTS) + 'leather_cap' => Item::get(Item::LEATHER_CAP), + 'leather_tunic' => Item::get(Item::LEATHER_TUNIC), + 'leather_pants' => Item::get(Item::LEATHER_PANTS), + 'leather_boots' => Item::get(Item::LEATHER_BOOTS), ]; $weapons = [ - "wooden_sword" => Item::get(Item::WOODEN_SWORD), - "bow" => Item::get(Item::BOW), - "stone_pickaxe" => Item::get(Item::STONE_PICKAXE), - "stone_axe" => Item::get(Item::STONE_AXE), - "stone_shovel" => Item::get(Item::STONE_SHOVEL) + 'wooden_sword' => Item::get(Item::WOODEN_SWORD), + 'bow' => Item::get(Item::BOW), + 'stone_pickaxe' => Item::get(Item::STONE_PICKAXE), + 'stone_axe' => Item::get(Item::STONE_AXE), + 'stone_shovel' => Item::get(Item::STONE_SHOVEL), ]; foreach ($armors as $armor) { if ($armor instanceof Durable and $armor instanceof Armor) { diff --git a/src/VectorNetworkProject/TheMix/game/kit/RedKit.php b/src/VectorNetworkProject/TheMix/game/kit/RedKit.php index 0cfa2bf..3180a03 100644 --- a/src/VectorNetworkProject/TheMix/game/kit/RedKit.php +++ b/src/VectorNetworkProject/TheMix/game/kit/RedKit.php @@ -8,7 +8,6 @@ namespace VectorNetworkProject\TheMix\game\kit; - use pocketmine\item\Armor; use pocketmine\item\Durable; use pocketmine\item\Item; @@ -20,17 +19,17 @@ class RedKit public static function sendItem(Player $player) { $armors = [ - "leather_cap" => Item::get(Item::LEATHER_CAP), - "leather_tunic" => Item::get(Item::LEATHER_TUNIC), - "leather_pants" => Item::get(Item::LEATHER_PANTS), - "leather_boots" => Item::get(Item::LEATHER_BOOTS) + 'leather_cap' => Item::get(Item::LEATHER_CAP), + 'leather_tunic' => Item::get(Item::LEATHER_TUNIC), + 'leather_pants' => Item::get(Item::LEATHER_PANTS), + 'leather_boots' => Item::get(Item::LEATHER_BOOTS), ]; $weapons = [ - "wooden_sword" => Item::get(Item::WOODEN_SWORD), - "bow" => Item::get(Item::BOW), - "stone_pickaxe" => Item::get(Item::STONE_PICKAXE), - "stone_axe" => Item::get(Item::STONE_AXE), - "stone_shovel" => Item::get(Item::STONE_SHOVEL) + 'wooden_sword' => Item::get(Item::WOODEN_SWORD), + 'bow' => Item::get(Item::BOW), + 'stone_pickaxe' => Item::get(Item::STONE_PICKAXE), + 'stone_axe' => Item::get(Item::STONE_AXE), + 'stone_shovel' => Item::get(Item::STONE_SHOVEL), ]; foreach ($armors as $armor) { if ($armor instanceof Durable and $armor instanceof Armor) { diff --git a/src/VectorNetworkProject/TheMix/game/streak/Streak.php b/src/VectorNetworkProject/TheMix/game/streak/Streak.php index b62fcb1..b398c20 100644 --- a/src/VectorNetworkProject/TheMix/game/streak/Streak.php +++ b/src/VectorNetworkProject/TheMix/game/streak/Streak.php @@ -39,6 +39,7 @@ public static function addStreak(Player $player): void /** * @param Player $player + * * @return int */ public static function getStreak(Player $player): int