Merge pull request #40 from supercrafter333/master

Try to fix #39
EvolSoft · Mar 7, 2021 · b319afa · b319afa
2 parents dae1b09 + 980648b
commit b319afa
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/MSpawns/MSpawns.php b/src/MSpawns/MSpawns.php
@@ -321,9 +321,16 @@ public function teleportToHub(Player $player) : int {
         if(!Server::getInstance()->loadLevel($hub["world"])){
             return self::ERR_HUB_INVALID_WORLD;
         }
-        $level = $this->getServer()->getLevelByName($hub["world"]);
-        $player->teleport(new Position($hub["X"], $hub["Y"], $hub["Z"], $level), $hub["Yaw"], $hub["Pitch"]);
-        return self::SUCCESS;
+        if (Server::getInstance()->isLevelLoaded($hub["world"])) {
+            $level = $this->getServer()->getLevelByName($hub["world"]);
+            $player->teleport(new Position($hub["X"], $hub["Y"], $hub["Z"], $level), $hub["Yaw"], $hub["Pitch"]);
+            return self::SUCCESS;
+        } else {
+            Server::getInstance()->loadLevel($hub["world"]);
+            $level = $this->getServer()->getLevelByName($hub["world"]);
+            $player->teleport(new Position($hub["X"], $hub["Y"], $hub["Z"], $level), $hub["Yaw"], $hub["Pitch"]);
+            return self::SUCCESS;
+        }
     }
 
     /**