mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-13 09:19:42 +00:00
Code Issues Projects Releases Wiki Activity

Player: clean up some crazy spawn logic in constructor

Browse Source 
this was probably a leftover from some old code, I guess
This commit is contained in:
Dylan K. Taylor 2019-06-17 17:07:31 +01:00
parent db3305cb16
commit e0a9ea2573
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/Player.php
View File

@ -315,7 +315,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
$spawn = new Vector3($pos[0], $pos[1], $pos[2]); $spawn = new Vector3($pos[0], $pos[1], $pos[2]);
}else{ }else{
$world = $this->server->getWorldManager()->getDefaultWorld(); //TODO: default world might be null $world = $this->server->getWorldManager()->getDefaultWorld(); //TODO: default world might be null
$spawn = $world->getSpawnLocation(); $spawn = $world->getSafeSpawn();
$spawnReset = true; $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->registerChunkLoader($this, $spawn->getFloorX() >> 4, $spawn->getFloorZ() >> 4, true);
$world->registerChunkListener($this, $spawn->getFloorX() >> 4, $spawn->getFloorZ() >> 4); $world->registerChunkListener($this, $spawn->getFloorX() >> 4, $spawn->getFloorZ() >> 4);
$this->usedChunks[World::chunkHash($spawn->getFloorX() >> 4, $spawn->getFloorZ() >> 4)] = false; $this->usedChunks[World::chunkHash($spawn->getFloorX() >> 4, $spawn->getFloorZ() >> 4)] = false;
if($spawnReset){
$spawn = $world->getSafeSpawn($spawn);
}
if($namedtag === null){ if($namedtag === null){
$namedtag = EntityFactory::createBaseNBT($spawn); $namedtag = EntityFactory::createBaseNBT($spawn);