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

World: make create params of loadChunk and getOrLoadChunk mandatory

Browse Source 
differences in the default values almost caused me to miss some bugs while trying to remove them.
This commit is contained in:
Dylan K. Taylor 2020-11-01 17:36:56 +00:00
parent 0bb37b5065
commit 61112e4912
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/world/World.php
View File

@ -586,7 +586,7 @@ class World implements ChunkManager{
$this->cancelUnloadChunkRequest($chunkX, $chunkZ); $this->cancelUnloadChunkRequest($chunkX, $chunkZ);
if($autoLoad){ if($autoLoad){
$this->loadChunk($chunkX, $chunkZ); $this->loadChunk($chunkX, $chunkZ, true);
} }
} }
@ -1847,7 +1847,7 @@ class World implements ChunkManager{
* Returns the tile at the specified x,y,z coordinates, or null if it does not exist. * Returns the tile at the specified x,y,z coordinates, or null if it does not exist.
*/ */
public function getTileAt(int $x, int $y, int $z) : ?Tile{ public function getTileAt(int $x, int $y, int $z) : ?Tile{
return ($chunk = $this->getOrLoadChunk($x >> 4, $z >> 4)) !== null ? $chunk->getTile($x & 0x0f, $y, $z & 0x0f) : null; return ($chunk = $this->getOrLoadChunk($x >> 4, $z >> 4, false)) !== null ? $chunk->getTile($x & 0x0f, $y, $z & 0x0f) : null;
} }
/** /**
@ -1919,7 +1919,7 @@ class World implements ChunkManager{
* *
* @param bool $create Whether to create an empty chunk as a placeholder if the chunk does not exist * @param bool $create Whether to create an empty chunk as a placeholder if the chunk does not exist
*/ */
public function getOrLoadChunk(int $chunkX, int $chunkZ, bool $create = false) : ?Chunk{ public function getOrLoadChunk(int $chunkX, int $chunkZ, bool $create) : ?Chunk{
if(isset($this->chunks[$index = World::chunkHash($chunkX, $chunkZ)])){ if(isset($this->chunks[$index = World::chunkHash($chunkX, $chunkZ)])){
return $this->chunks[$index]; return $this->chunks[$index];
}elseif($this->loadChunk($chunkX, $chunkZ, $create)){ }elseif($this->loadChunk($chunkX, $chunkZ, $create)){
@ -2086,12 +2086,12 @@ class World implements ChunkManager{
} }
public function isChunkGenerated(int $x, int $z) : bool{ public function isChunkGenerated(int $x, int $z) : bool{
$chunk = $this->getOrLoadChunk($x, $z); $chunk = $this->getOrLoadChunk($x, $z, false);
return $chunk !== null ? $chunk->isGenerated() : false; return $chunk !== null ? $chunk->isGenerated() : false;
} }
public function isChunkPopulated(int $x, int $z) : bool{ public function isChunkPopulated(int $x, int $z) : bool{
$chunk = $this->getOrLoadChunk($x, $z); $chunk = $this->getOrLoadChunk($x, $z, false);
return $chunk !== null ? $chunk->isPopulated() : false; return $chunk !== null ? $chunk->isPopulated() : false;
} }
@ -2205,7 +2205,7 @@ class World implements ChunkManager{
* *
* @throws \InvalidStateException * @throws \InvalidStateException
*/ */
public function loadChunk(int $x, int $z, bool $create = true) : bool{ public function loadChunk(int $x, int $z, bool $create) : bool{
if(isset($this->chunks[$chunkHash = World::chunkHash($x, $z)])){ if(isset($this->chunks[$chunkHash = World::chunkHash($x, $z)])){
return true; return true;
} }