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

Merge branch '3.6'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-03-08 13:57:32 +00:00
commit bb718faa2e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,7 @@ class LevelDB extends BaseLevelProvider{
$biomeIds = ""; $biomeIds = "";
$chunkVersion = ord($this->db->get($index . self::TAG_VERSION)); $chunkVersion = ord($this->db->get($index . self::TAG_VERSION));
$hasBeenUpgraded = $chunkVersion < self::CURRENT_LEVEL_CHUNK_VERSION;
$binaryStream = new BinaryStream(); $binaryStream = new BinaryStream();
@ -171,6 +172,9 @@ class LevelDB extends BaseLevelProvider{
throw new CorruptedChunkException("Unexpected empty data for subchunk $y"); throw new CorruptedChunkException("Unexpected empty data for subchunk $y");
} }
$subChunkVersion = $binaryStream->getByte(); $subChunkVersion = $binaryStream->getByte();
if($subChunkVersion < self::CURRENT_LEVEL_SUBCHUNK_VERSION){
$hasBeenUpgraded = true;
}
switch($subChunkVersion){ switch($subChunkVersion){
case 0: case 0:
@ -180,6 +184,7 @@ class LevelDB extends BaseLevelProvider{
if($chunkVersion < 4){ if($chunkVersion < 4){
$binaryStream->get(4096); //legacy light info, discard it $binaryStream->get(4096); //legacy light info, discard it
$hasBeenUpgraded = true;
} }
}catch(BinaryDataException $e){ }catch(BinaryDataException $e){
throw new CorruptedChunkException($e->getMessage(), 0, $e); throw new CorruptedChunkException($e->getMessage(), 0, $e);
@ -295,6 +300,7 @@ class LevelDB extends BaseLevelProvider{
$chunk->setGenerated(); $chunk->setGenerated();
$chunk->setPopulated(); $chunk->setPopulated();
$chunk->setChanged($hasBeenUpgraded); //trigger rewriting chunk to disk if it was converted from an older format
return $chunk; return $chunk;
} }