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

ChunkManager->setChunk() no longer accepts NULL

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-12-05 18:54:30 +00:00
parent b6df5b974d
commit 59cb11dc83
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/world/ChunkManager.php
View File

@ -42,7 +42,7 @@ interface ChunkManager{
public function getChunk(int $chunkX, int $chunkZ) : ?Chunk; public function getChunk(int $chunkX, int $chunkZ) : ?Chunk;
public function setChunk(int $chunkX, int $chunkZ, ?Chunk $chunk) : void; public function setChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void;
/** /**
* Returns the height of the world * Returns the height of the world

6
src/world/SimpleChunkManager.php
View File

@ -63,11 +63,7 @@ class SimpleChunkManager implements ChunkManager{
return $this->chunks[World::chunkHash($chunkX, $chunkZ)] ?? null; return $this->chunks[World::chunkHash($chunkX, $chunkZ)] ?? null;
} }
public function setChunk(int $chunkX, int $chunkZ, ?Chunk $chunk) : void{ public function setChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void{
if($chunk === null){
unset($this->chunks[World::chunkHash($chunkX, $chunkZ)]);
return;
}
$this->chunks[World::chunkHash($chunkX, $chunkZ)] = $chunk; $this->chunks[World::chunkHash($chunkX, $chunkZ)] = $chunk;
} }

6
src/world/World.php
View File

@ -2025,11 +2025,7 @@ class World implements ChunkManager{
/** /**
* @param bool $deleteEntitiesAndTiles Whether to delete entities and tiles on the old chunk, or transfer them to the new one * @param bool $deleteEntitiesAndTiles Whether to delete entities and tiles on the old chunk, or transfer them to the new one
*/ */
public function setChunk(int $chunkX, int $chunkZ, ?Chunk $chunk, bool $deleteEntitiesAndTiles = true) : void{ public function setChunk(int $chunkX, int $chunkZ, Chunk $chunk, bool $deleteEntitiesAndTiles = true) : void{
if($chunk === null){
return;
}
$chunkHash = World::chunkHash($chunkX, $chunkZ); $chunkHash = World::chunkHash($chunkX, $chunkZ);
$oldChunk = $this->loadChunk($chunkX, $chunkZ); $oldChunk = $this->loadChunk($chunkX, $chunkZ);
if($oldChunk !== null and $oldChunk !== $chunk){ if($oldChunk !== null and $oldChunk !== $chunk){