Fix bugs

Author: InkoHX

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

@@ -13,6 +13,7 @@
 use pocketmine\event\Listener;
 use pocketmine\event\player\PlayerInteractEvent;
 use VectorNetworkProject\TheMix\game\corepvp\TeamManager;
+use VectorNetworkProject\TheMix\game\DefaultConfig;
 
 class ThePlayerInteractEvent implements Listener
 {
@@ -21,6 +22,7 @@ public function event(PlayerInteractEvent $event)
         $player = $event->getPlayer();
         $block = $event->getBlock();
         if ($block->getId() === Block::NETHER_REACTOR) {
+            if (DefaultConfig::isDev()) return;
             TeamManager::JoinTeam($player);
         }
     }

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

@@ -9,7 +9,9 @@
 namespace VectorNetworkProject\TheMix\game\corepvp;
 
 use pocketmine\Player;
+use VectorNetworkProject\TheMix\game\corepvp\blue\BlueSpawnManager;
 use VectorNetworkProject\TheMix\game\corepvp\blue\BlueTeamManager;
+use VectorNetworkProject\TheMix\game\corepvp\red\RedSpawnManager;
 use VectorNetworkProject\TheMix\game\corepvp\red\RedTeamManager;
 use VectorNetworkProject\TheMix\game\kit\BlueKit;
 use VectorNetworkProject\TheMix\game\kit\RedKit;
@@ -24,9 +26,11 @@ public static function JoinTeam(Player $player)
         if (BlueTeamManager::getListCount() < RedTeamManager::getListCount()) {
             BlueTeamManager::addList($player);
             BlueKit::sendItems($player);
+            $player->teleport(BlueSpawnManager::getRandomPosition());
         } else {
             RedTeamManager::addList($player);
             RedKit::sendItem($player);
+            $player->teleport(RedSpawnManager::getRandomPosition());
         }
     }
 

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

@@ -20,11 +20,13 @@ class BlueSpawnManager extends SpawnManager
      */
     public static function getRandomPosition(): ?Position
     {
-        $position1 = DefaultConfig::getBlueConfig()['spawn1'];
-        $position2 = DefaultConfig::getBlueConfig()['spawn2'];
         switch (mt_rand(1, 2)) {
-            case 1: return new Position($position1['x'].$position1['y'], $position1['z'], Server::getInstance()->getLevelByName(DefaultConfig::getStageLevelName())); break;
-            case 2: return new Position($position2['x'].$position2['y'], $position2['z'], Server::getInstance()->getLevelByName(DefaultConfig::getStageLevelName())); break;
+            case 1:
+                return new Position(131, 80, 25, Server::getInstance()->getLevelByName(DefaultConfig::getStageLevelName()));
+                break;
+            case 2:
+                return new Position(131, 80, -25, Server::getInstance()->getLevelByName(DefaultConfig::getStageLevelName()));
+                break;
             default: return null;
         }
     }

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

@@ -19,7 +19,7 @@ class BlueTeamManager extends TeamManager
     public static function addList(Player $player): void
     {
         if (!self::isJoined($player)) {
-            self::$list[$player->getName()];
+            self::$list[$player->getName()] = $player->getName();
         }
     }
 

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

@@ -20,14 +20,12 @@ class RedSpawnManager extends SpawnManager
      */
     public static function getRandomPosition(): ?Position
     {
-        $position1 = DefaultConfig::getRedConfig()['spawn1'];
-        $position2 = DefaultConfig::getRedConfig()['spawn2'];
         switch (mt_rand(1, 2)) {
             case 1:
-                return new Position($position1['x'].$position1['y'], $position1['z'], Server::getInstance()->getLevelByName(DefaultConfig::getStageLevelName()));
+                return new Position(-131, 80, 25, Server::getInstance()->getLevelByName(DefaultConfig::getStageLevelName()));
                 break;
             case 2:
-                return new Position($position2['x'].$position2['y'], $position2['z'], Server::getInstance()->getLevelByName(DefaultConfig::getStageLevelName()));
+                return new Position(-131, 80, -25, Server::getInstance()->getLevelByName(DefaultConfig::getStageLevelName()));
                 break;
             default:
                 return null;

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

@@ -19,7 +19,7 @@ class RedTeamManager extends TeamManager
     public static function addList(Player $player): void
     {
         if (!self::isJoined($player)) {
-            self::$list[$player->getName()];
+            self::$list[$player->getName()] = $player->getName();
         }
     }