Merge branch 'develop' of https://github.com/VectorNetworkProject/TheMix into develop

Author: InkoHX

src/VectorNetworkProject/TheMix/event/player/ThePlayerInteractEvent.php

@@ -10,6 +10,7 @@
 
 use pocketmine\event\Listener;
 use pocketmine\event\player\PlayerInteractEvent;
+use pocketmine\Player;
 use VectorNetworkProject\TheMix\game\corepvp\TeamManager;
 use VectorNetworkProject\TheMix\game\DefaultConfig;
 
@@ -27,6 +28,7 @@ public function event(PlayerInteractEvent $event)
                 return;
             }
             TeamManager::JoinTeam($player);
+            $player->setGamemode(Player::SURVIVAL);
         }
     }
 }

src/VectorNetworkProject/TheMix/game/GameManager.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (c) 2018 VectorNetworkProject. All rights reserved. MIT license.
+ *
+ * GitHub: https://github.com/VectorNetworkProject/TheMix
+ * Website: https://www.vector-network.tk
+ */
+
+namespace VectorNetworkProject\TheMix\game;
+
+use pocketmine\entity\Effect;
+use pocketmine\entity\EffectInstance;
+use pocketmine\Player;
+use pocketmine\Server;
+use VectorNetworkProject\TheMix\event\game\TheEndGameEvent;
+use VectorNetworkProject\TheMix\game\corepvp\CoreManager;
+use VectorNetworkProject\TheMix\game\corepvp\TeamManager;
+use VectorNetworkProject\TheMix\TheMix;
+
+class GameManager
+{
+    public static function resetGame(): void
+    {
+        TeamManager::resetTeam();
+        CoreManager::resetHP();
+        TheEndGameEvent::setFinish(false);
+        foreach (Server::getInstance()->getOnlinePlayers() as $player) {
+            $player->teleport(Server::getInstance()->getDefaultLevel()->getSpawnLocation());
+            $player->setGamemode(Player::ADVENTURE);
+            $player->setNameTag($player->getName());
+            $player->setDisplayName($player->getName());
+            $player->setFood(20);
+            $player->setHealth(20);
+            $player->setMaxHealth(20);
+            $player->getInventory()->clearAll();
+            $player->getArmorInventory()->clearAll();
+            $player->removeAllEffects();
+            $player->addEffect(new EffectInstance(Effect::getEffect(Effect::NIGHT_VISION), 99999999 * 20, 11, false));
+        }
+        TheMix::getInstance()->getServer()->unloadLevel(TheMix::getInstance()->getServer()->getLevelByName(DefaultConfig::getStageLevelName()));
+        TheMix::getInstance()->getServer()->loadLevel(DefaultConfig::getStageLevelName());
+    }
+}

src/VectorNetworkProject/TheMix/game/corepvp/CoreManager.php

@@ -10,9 +10,19 @@
 
 use pocketmine\block\Block;
 use pocketmine\Player;
+use VectorNetworkProject\TheMix\game\corepvp\blue\BlueCoreManager;
+use VectorNetworkProject\TheMix\game\corepvp\red\RedCoreManager;
 
 abstract class CoreManager
 {
+    const MAX_HP = 100;
+
+    public static function resetHP(): void
+    {
+        RedCoreManager::setHP(self::MAX_HP);
+        BlueCoreManager::setHP(self::MAX_HP);
+    }
+
     /**
      * @param int $hp
      */

src/VectorNetworkProject/TheMix/game/corepvp/TeamManager.php

@@ -43,6 +43,12 @@ public static function JoinTeam(Player $player)
         }
     }
 
+    public static function resetTeam(): void
+    {
+        RedTeamManager::ClearList();
+        BlueTeamManager::ClearList();
+    }
+
     /**
      * @param Player $player
      */

src/VectorNetworkProject/TheMix/game/corepvp/blue/BlueCoreManager.php

@@ -17,7 +17,7 @@
 class BlueCoreManager extends CoreManager
 {
     /** @var int $hp */
-    private static $hp = 75;
+    private static $hp = self::MAX_HP;
 
     /**
      * @param int $hp

src/VectorNetworkProject/TheMix/game/corepvp/red/RedCoreManager.php

@@ -17,7 +17,7 @@
 class RedCoreManager extends CoreManager
 {
     /** @var int $hp */
-    private static $hp = 75;
+    private static $hp = self::MAX_HP;
 
     /**
      * @param int $hp

src/VectorNetworkProject/TheMix/task/BlockReGeneratorTask.php

@@ -10,6 +10,7 @@
 
 use pocketmine\block\Block;
 use pocketmine\scheduler\Task;
+use VectorNetworkProject\TheMix\TheMix;
 
 class BlockReGeneratorTask extends Task
 {
@@ -26,6 +27,11 @@ public function __construct(Block $block)
      */
     public function onRun(int $currentTick)
     {
+        if (TheMix::getInstance()->getServer()->getLevelByName($this->getBlock()->getLevel()->getName())->getId() === $this->getBlock()->getLevel()->getId()) {
+            $this->getHandler()->cancel();
+
+            return;
+        }
         $this->getBlock()->getLevel()->setBlock($this->getBlock()->asVector3(), $this->block);
     }
 

src/VectorNetworkProject/TheMix/task/ResetGameTask.php

@@ -9,8 +9,7 @@
 namespace VectorNetworkProject\TheMix\task;
 
 use pocketmine\scheduler\Task;
-use pocketmine\Server;
-use VectorNetworkProject\TheMix\game\DefaultConfig;
+use VectorNetworkProject\TheMix\game\GameManager;
 
 class ResetGameTask extends Task
 {
@@ -19,9 +18,6 @@ class ResetGameTask extends Task
      */
     public function onRun(int $currentTick)
     {
-        foreach (Server::getInstance()->getOnlinePlayers() as $player) {
-            $player->transfer(DefaultConfig::getIp(), DefaultConfig::getPort(), '再接続');
-        }
-        Server::getInstance()->shutdown();
+        GameManager::resetGame();
     }
 }