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

Merge commit '725506510'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/level/format/io/leveldb/LevelDB.php
This commit is contained in:
Dylan K. Taylor 2020-06-13 11:55:10 +01:00
commit 0d186fe42c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/world/format/io/leveldb/LevelDB.php
View File

@ -226,7 +226,8 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
protected function readChunk(int $chunkX, int $chunkZ) : ?Chunk{ protected function readChunk(int $chunkX, int $chunkZ) : ?Chunk{
$index = LevelDB::chunkIndex($chunkX, $chunkZ); $index = LevelDB::chunkIndex($chunkX, $chunkZ);
if(!$this->chunkExists($chunkX, $chunkZ)){ $chunkVersionRaw = $this->db->get($index . self::TAG_VERSION);
if($chunkVersionRaw === false){
return null; return null;
} }
@ -236,7 +237,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
/** @var BiomeArray|null $biomeArray */ /** @var BiomeArray|null $biomeArray */
$biomeArray = null; $biomeArray = null;
$chunkVersion = ord($this->db->get($index . self::TAG_VERSION)); $chunkVersion = ord($chunkVersionRaw);
$hasBeenUpgraded = $chunkVersion < self::CURRENT_LEVEL_CHUNK_VERSION; $hasBeenUpgraded = $chunkVersion < self::CURRENT_LEVEL_CHUNK_VERSION;
$binaryStream = new BinaryStream(); $binaryStream = new BinaryStream();