diff --git a/src/pocketmine/level/format/Chunk.php b/src/pocketmine/level/format/Chunk.php index da04e38ea..2a7521643 100644 --- a/src/pocketmine/level/format/Chunk.php +++ b/src/pocketmine/level/format/Chunk.php @@ -1004,11 +1004,6 @@ class Chunk{ return $chunk; } - //TODO: get rid of this - public static function getEmptyChunk(int $x, int $z) : Chunk{ - return new Chunk($x, $z); - } - /** * Creates a block hash from chunk block coordinates. Used for extra data keys in chunk packets. * @internal diff --git a/src/pocketmine/level/format/io/leveldb/LevelDB.php b/src/pocketmine/level/format/io/leveldb/LevelDB.php index f8cf54fb1..0f765a9f6 100644 --- a/src/pocketmine/level/format/io/leveldb/LevelDB.php +++ b/src/pocketmine/level/format/io/leveldb/LevelDB.php @@ -298,7 +298,7 @@ class LevelDB extends BaseLevelProvider{ $this->level->timings->syncChunkLoadDataTimer->startTiming(); $chunk = $this->readChunk($chunkX, $chunkZ); if($chunk === null and $create){ - $chunk = Chunk::getEmptyChunk($chunkX, $chunkZ); + $chunk = new Chunk($chunkX, $chunkZ); } $this->level->timings->syncChunkLoadDataTimer->stopTiming(); diff --git a/src/pocketmine/level/format/io/region/McRegion.php b/src/pocketmine/level/format/io/region/McRegion.php index 8f6f5d22a..eab5036b5 100644 --- a/src/pocketmine/level/format/io/region/McRegion.php +++ b/src/pocketmine/level/format/io/region/McRegion.php @@ -343,7 +343,7 @@ class McRegion extends BaseLevelProvider{ /** @noinspection PhpStrictTypeCheckingInspection */ $chunk = $this->getRegion($regionX, $regionZ)->readChunk($chunkX - $regionX * 32, $chunkZ - $regionZ * 32); if($chunk === null and $create){ - $chunk = $this->getEmptyChunk($chunkX, $chunkZ); + $chunk = new Chunk($chunkX, $chunkZ); } $this->level->timings->syncChunkLoadDataTimer->stopTiming(); @@ -418,16 +418,6 @@ class McRegion extends BaseLevelProvider{ $z = $chunkZ >> 5; } - /** - * @param int $chunkX - * @param int $chunkZ - * - * @return Chunk - */ - public function getEmptyChunk(int $chunkX, int $chunkZ) : Chunk{ - return Chunk::getEmptyChunk($chunkX, $chunkZ); - } - /** * @param int $x * @param int $z diff --git a/src/pocketmine/level/generator/PopulationTask.php b/src/pocketmine/level/generator/PopulationTask.php index ea0a78910..ed38db6d4 100644 --- a/src/pocketmine/level/generator/PopulationTask.php +++ b/src/pocketmine/level/generator/PopulationTask.php @@ -78,7 +78,7 @@ class PopulationTask extends AsyncTask{ $zz = -1 + (int) ($i / 3); $ck = $this->{"chunk$i"}; if($ck === null){ - $chunks[$i] = Chunk::getEmptyChunk($chunk->getX() + $xx, $chunk->getZ() + $zz); + $chunks[$i] = new Chunk($chunk->getX() + $xx, $chunk->getZ() + $zz); }else{ $chunks[$i] = Chunk::fastDeserialize($ck); }