Merge branch 'master' into develop

InkoHX · InkoHX · commit 6c9853c5258f · 2018-12-03T00:20:04.000+09:00
diff --git a/src/VectorNetworkProject/TheMix/event/block/BlockReGeneratorEvent.php b/src/VectorNetworkProject/TheMix/event/block/BlockReGeneratorEvent.php
@@ -23,7 +23,9 @@ public function event(BlockBreakEvent $event): void
     {
         $block = $event->getBlock();
         $inventory = $event->getPlayer()->getInventory();
-        if (DefaultConfig::isDev() || $block->getLevel()->getName() !== DefaultConfig::getStageLevelName() || TheEndGameEvent::isFinish()) return;
+        if (DefaultConfig::isDev() || $block->getLevel()->getName() !== DefaultConfig::getStageLevelName() || TheEndGameEvent::isFinish()) {
+            return;
+        }
         $event->setDrops([]);
         switch ($block->getId()) {
             case Block::MELON_BLOCK:
@@ -33,6 +35,7 @@ public function event(BlockBreakEvent $event): void
             case Block::WOOD:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
+
                     return;
                 }
                 $inventory->addItem(Item::get(Item::WOODEN_PLANKS, 0, 4));
@@ -41,6 +44,7 @@ public function event(BlockBreakEvent $event): void
             case Block::DIAMOND_ORE:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
+
                     return;
                 }
                 $inventory->addItem(Item::get(Item::DIAMOND));
@@ -49,6 +53,7 @@ public function event(BlockBreakEvent $event): void
             case Block::EMERALD_ORE:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
+
                     return;
                 }
                 $inventory->addItem(Item::get(Item::EMERALD, 0, mt_rand(1, 3)));
@@ -57,6 +62,7 @@ public function event(BlockBreakEvent $event): void
             case Block::COAL_ORE:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
+
                     return;
                 }
                 $inventory->addItem(Item::get(Item::COAL));
@@ -65,6 +71,7 @@ public function event(BlockBreakEvent $event): void
             case Block::IRON_ORE:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
+
                     return;
                 }
                 $inventory->addItem(Item::get(Item::IRON_INGOT));
@@ -73,6 +80,7 @@ public function event(BlockBreakEvent $event): void
             case Block::GOLD_ORE:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
+
                     return;
                 }
                 $inventory->addItem(Item::get(Item::GOLD_INGOT));
@@ -81,6 +89,7 @@ public function event(BlockBreakEvent $event): void
             default:
                 if ($event->getPlayer()->getLevel()->getName() === DefaultConfig::getStageLevelName() && DefaultConfig::isDev() === false) {
                     $event->setCancelled();
+
                     return;
                 }
         }
diff --git a/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php b/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php
@@ -41,8 +41,9 @@ public function event(BlockBreakEvent $event)
         }
         if (!DefaultConfig::isDev()) {
             if (RedTeamManager::getListCount() < 1 || BlueTeamManager::getListCount() < 1) {
-                $player->sendMessage("プレイヤーが足りないのでコアを破壊する事が出来ません。");
+                $player->sendMessage('プレイヤーが足りないのでコアを破壊する事が出来ません。');
                 $event->setCancelled();
+
                 return;
             }
             if (RedCoreManager::isCore($block)) {
diff --git a/src/VectorNetworkProject/TheMix/event/entity/TheEntityDamageEvent.php b/src/VectorNetworkProject/TheMix/event/entity/TheEntityDamageEvent.php
@@ -40,7 +40,9 @@ public function event(EntityDamageEvent $event)
         if ($event->getCause() === EntityDamageEvent::CAUSE_FALL) {
             return;
         }
-        if ($entity->getLevel()->getName() === Server::getInstance()->getDefaultLevel()->getName()) $event->setCancelled();
+        if ($entity->getLevel()->getName() === Server::getInstance()->getDefaultLevel()->getName()) {
+            $event->setCancelled();
+        }
         if ($event instanceof EntityDamageByEntityEvent) {
             $event->setCancelled();
             ItemManager::DropItem($entity);
@@ -50,6 +52,7 @@ public function event(EntityDamageEvent $event)
             if ($damager instanceof Player) {
                 if ($entity->getName() === $damager->getName()) {
                     Server::getInstance()->broadcastMessage("{$entity->getNameTag()} §fは自滅した。");
+
                     return;
                 }
                 Streak::addStreak($damager);
@@ -71,7 +74,9 @@ public function BlockTeamPvP(EntityDamageEvent $event)
         if ($event instanceof EntityDamageByEntityEvent) {
             $entity = $event->getEntity();
             $damager = $event->getDamager();
-            if (!$entity instanceof Player && !$damager instanceof Player) return;
+            if (!$entity instanceof Player && !$damager instanceof Player) {
+                return;
+            }
             if (BlueTeamManager::isJoined($entity) === true && BlueTeamManager::isJoined($damager) === true) {
                 $event->setCancelled();
             } elseif (RedTeamManager::isJoined($entity) === true && RedTeamManager::isJoined($damager) === true) {
diff --git a/src/VectorNetworkProject/TheMix/event/gold/ThePlayerAddGoldEvent.php b/src/VectorNetworkProject/TheMix/event/gold/ThePlayerAddGoldEvent.php
@@ -8,7 +8,6 @@
 
 namespace VectorNetworkProject\TheMix\event\gold;
 
-
 use InkoHX\GoldLibrary\event\PlayerAddGoldEvent;
 use pocketmine\event\Listener;
 
diff --git a/src/VectorNetworkProject/TheMix/event/level/TheItemSpawnEvent.php b/src/VectorNetworkProject/TheMix/event/level/TheItemSpawnEvent.php
@@ -8,7 +8,6 @@
 
 namespace VectorNetworkProject\TheMix\event\level;
 
-
 use pocketmine\event\entity\ItemSpawnEvent;
 use pocketmine\event\Listener;
 use pocketmine\item\Item;
diff --git a/src/VectorNetworkProject/TheMix/event/level/ThePlayerAddXpEvent.php b/src/VectorNetworkProject/TheMix/event/level/ThePlayerAddXpEvent.php
@@ -8,7 +8,6 @@
 
 namespace VectorNetworkProject\TheMix\event\level;
 
-
 use InkoHX\LeveLibrary\event\xp\PlayerAddXpEvent;
 use pocketmine\event\Listener;
 
diff --git a/src/VectorNetworkProject/TheMix/event/player/ThePlayerInteractEvent.php b/src/VectorNetworkProject/TheMix/event/player/ThePlayerInteractEvent.php
@@ -8,7 +8,6 @@
 
 namespace VectorNetworkProject\TheMix\event\player;
 
-
 use pocketmine\block\Block;
 use pocketmine\event\Listener;
 use pocketmine\event\player\PlayerInteractEvent;
@@ -22,7 +21,9 @@ public function event(PlayerInteractEvent $event)
         $player = $event->getPlayer();
         $block = $event->getBlock();
         if ($block->getId() === Block::NETHER_REACTOR) {
-            if (DefaultConfig::isDev()) return;
+            if (DefaultConfig::isDev()) {
+                return;
+            }
             TeamManager::JoinTeam($player);
         }
     }
diff --git a/src/VectorNetworkProject/TheMix/game/corepvp/TeamManager.php b/src/VectorNetworkProject/TheMix/game/corepvp/TeamManager.php
@@ -29,14 +29,14 @@ public static function JoinTeam(Player $player)
             $player->teleport(BlueSpawnManager::getRandomPosition());
             $player->setNameTag("§b{$player->getName()}§r");
             $player->setDisplayName("§b{$player->getName()}§r");
-            $player->sendMessage("§bBLUE§fに入りました。");
+            $player->sendMessage('§bBLUE§fに入りました。');
         } else {
             RedTeamManager::addList($player);
             RedKit::sendItem($player);
             $player->teleport(RedSpawnManager::getRandomPosition());
             $player->setNameTag("§c{$player->getName()}§r");
             $player->setDisplayName("§c{$player->getName()}§r");
-            $player->sendMessage("§cRED§fに入りました。");
+            $player->sendMessage('§cRED§fに入りました。');
         }
     }
 
diff --git a/src/VectorNetworkProject/TheMix/game/item/ItemManager.php b/src/VectorNetworkProject/TheMix/game/item/ItemManager.php
@@ -8,7 +8,6 @@
 
 namespace VectorNetworkProject\TheMix\game\item;
 
-
 use pocketmine\item\Item;
 use pocketmine\Player;
 
diff --git a/src/VectorNetworkProject/TheMix/task/ResetGameTask.php b/src/VectorNetworkProject/TheMix/task/ResetGameTask.php
@@ -16,7 +16,7 @@ class ResetGameTask extends Task
     public function onRun(int $currentTick)
     {
         foreach (Server::getInstance()->getOnlinePlayers() as $player) {
-            $player->transfer("play.vector-network.tk", 19132, '再接続');
+            $player->transfer('play.vector-network.tk', 19132, '再接続');
         }
         Server::getInstance()->shutdown();
     }

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,9 @@ public function event(BlockBreakEvent $event)`
`41`	`41`	`}`
`42`	`42`	`if (!DefaultConfig::isDev()) {`
`43`	`43`	`if (RedTeamManager::getListCount() < 1 \|\| BlueTeamManager::getListCount() < 1) {`
`44`		`- $player->sendMessage("プレイヤーが足りないのでコアを破壊する事が出来ません。");`
	`44`	`+ $player->sendMessage('プレイヤーが足りないのでコアを破壊する事が出来ません。');`
`45`	`45`	`$event->setCancelled();`
	`46`	`+`
`46`	`47`	`return;`
`47`	`48`	`}`
`48`	`49`	`if (RedCoreManager::isCore($block)) {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class ResetGameTask extends Task`
`16`	`16`	`public function onRun(int $currentTick)`
`17`	`17`	`{`
`18`	`18`	`foreach (Server::getInstance()->getOnlinePlayers() as $player) {`
`19`		`- $player->transfer("play.vector-network.tk", 19132, '再接続');`
	`19`	`+ $player->transfer('play.vector-network.tk', 19132, '再接続');`
`20`	`20`	`}`
`21`	`21`	`Server::getInstance()->shutdown();`
`22`	`22`	`}`