From e0a9ea2573372ffac576105d2a26e248c9959223 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Mon, 17 Jun 2019 17:07:31 +0100
Subject: [PATCH] Player: clean up some crazy spawn logic in constructor

this was probably a leftover from some old code, I guess
---
 src/pocketmine/Player.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index a6f1af679..98e6c10b3 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -315,7 +315,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
 			$spawn = new Vector3($pos[0], $pos[1], $pos[2]);
 		}else{
 			$world = $this->server->getWorldManager()->getDefaultWorld(); //TODO: default world might be null
-			$spawn = $world->getSpawnLocation();
+			$spawn = $world->getSafeSpawn();
 			$spawnReset = true;
 		}
 
@@ -323,9 +323,6 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
 		$world->registerChunkLoader($this, $spawn->getFloorX() >> 4, $spawn->getFloorZ() >> 4, true);
 		$world->registerChunkListener($this, $spawn->getFloorX() >> 4, $spawn->getFloorZ() >> 4);
 		$this->usedChunks[World::chunkHash($spawn->getFloorX() >> 4, $spawn->getFloorZ() >> 4)] = false;
-		if($spawnReset){
-			$spawn = $world->getSafeSpawn($spawn);
-		}
 
 		if($namedtag === null){
 			$namedtag = EntityFactory::createBaseNBT($spawn);