mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-06 01:51:51 +00:00
Code Issues Projects Releases Wiki Activity

Level: cleaned up some nonsensical code in getSafeSpawn()

Browse Source 
it's impossible for this function to return false because $spawn is guaranteed to be a Vector3 when it's checked in instanceof.
This commit is contained in:
Dylan K. Taylor 2018-05-19 13:18:20 +01:00
parent 6c3fc4af46
commit 71224f51d5
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/pocketmine/level/Level.php
View File

@ -2763,49 +2763,46 @@ class Level implements ChunkManager, Metadatable{
/** /**
* @param Vector3 $spawn default null * @param Vector3 $spawn default null
* *
* @return bool|Position * @return Position
*/ */
public function getSafeSpawn($spawn = null){ public function getSafeSpawn(?Vector3 $spawn = null) : Position{
if(!($spawn instanceof Vector3) or $spawn->y < 1){ if(!($spawn instanceof Vector3) or $spawn->y < 1){
$spawn = $this->getSpawnLocation(); $spawn = $this->getSpawnLocation();
} }
if($spawn instanceof Vector3){
$max = $this->worldHeight;
$v = $spawn->floor();
$chunk = $this->getChunk($v->x >> 4, $v->z >> 4, false);
$x = (int) $v->x;
$z = (int) $v->z;
if($chunk !== null){
$y = (int) min($max - 2, $v->y);
$wasAir = ($chunk->getBlockId($x & 0x0f, $y - 1, $z & 0x0f) === 0);
for(; $y > 0; --$y){
if($this->isFullBlock($this->getBlockAt($x, $y, $z))){
if($wasAir){
$y++;
break;
}
}else{
$wasAir = true;
}
}
for(; $y >= 0 and $y < $max; ++$y){ $max = $this->worldHeight;
if(!$this->isFullBlock($this->getBlockAt($x, $y + 1, $z))){ $v = $spawn->floor();
if(!$this->isFullBlock($this->getBlockAt($x, $y, $z))){ $chunk = $this->getChunk($v->x >> 4, $v->z >> 4, false);
return new Position($spawn->x, $y === (int) $spawn->y ? $spawn->y : $y, $spawn->z, $this); $x = (int) $v->x;
} $z = (int) $v->z;
}else{ if($chunk !== null){
++$y; $y = (int) min($max - 2, $v->y);
$wasAir = ($chunk->getBlockId($x & 0x0f, $y - 1, $z & 0x0f) === 0);
for(; $y > 0; --$y){
if($this->isFullBlock($this->getBlockAt($x, $y, $z))){
if($wasAir){
$y++;
break;
} }
}else{
$wasAir = true;
} }
$v->y = $y;
} }
return new Position($spawn->x, $v->y, $spawn->z, $this); for(; $y >= 0 and $y < $max; ++$y){
if(!$this->isFullBlock($this->getBlockAt($x, $y + 1, $z))){
if(!$this->isFullBlock($this->getBlockAt($x, $y, $z))){
return new Position($spawn->x, $y === (int) $spawn->y ? $spawn->y : $y, $spawn->z, $this);
}
}else{
++$y;
}
}
$v->y = $y;
} }
return false; return new Position($spawn->x, $v->y, $spawn->z, $this);
} }
/** /**