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

LevelDB: stop passing false to places where it's not expected

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-06-10 10:45:54 +01:00
parent a7f10d8ccf
commit 7255065106
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pocketmine/level/format/io/leveldb/LevelDB.php
View File

@ -301,7 +301,8 @@ class LevelDB extends BaseLevelProvider{
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;
} }
@ -316,7 +317,7 @@ class LevelDB extends BaseLevelProvider{
/** @var bool $lightPopulated */ /** @var bool $lightPopulated */
$lightPopulated = true; $lightPopulated = true;
$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();
@ -368,7 +369,11 @@ class LevelDB extends BaseLevelProvider{
} }
break; break;
case 2: // < MCPE 1.0 case 2: // < MCPE 1.0
$binaryStream->setBuffer($this->db->get($index . self::TAG_LEGACY_TERRAIN)); $legacyTerrain = $this->db->get($index . self::TAG_LEGACY_TERRAIN);
if($legacyTerrain === false){
throw new CorruptedChunkException("Expected to find a LEGACY_TERRAIN key for this chunk version, but none found");
}
$binaryStream->setBuffer($legacyTerrain);
$fullIds = $binaryStream->get(32768); $fullIds = $binaryStream->get(32768);
$fullData = $binaryStream->get(16384); $fullData = $binaryStream->get(16384);
$fullSkyLight = $binaryStream->get(16384); $fullSkyLight = $binaryStream->get(16384);