mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 00:33:59 +00:00
Code Issues Projects Releases Wiki Activity

McRegion: skip chunks with TerrainGenerated=false

Browse Source 
legacy PM used to save even ungenerated chunks, and omitted some tags when doing so which we expect to always be present.
This commit is contained in:
Dylan K. Taylor 2021-11-23 01:49:48 +00:00
parent fb0eebc0dc
commit d8f0fd0a7e
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/world/format/io/region/LegacyAnvilChunkTrait.php
View File

@ -51,7 +51,7 @@ trait LegacyAnvilChunkTrait{
/**
* @throws CorruptedChunkException
*/
protected function deserializeChunk(string $data) : ChunkData{
protected function deserializeChunk(string $data) : ?ChunkData{
$decompressed = @zlib_decode($data);
if($decompressed === false){
throw new CorruptedChunkException("Failed to decompress chunk NBT");

11
src/world/format/io/region/McRegion.php
View File

@ -29,6 +29,7 @@ use pocketmine\data\bedrock\BiomeIds;
use pocketmine\nbt\BigEndianNbtSerializer;
use pocketmine\nbt\NbtDataException;
use pocketmine\nbt\tag\ByteArrayTag;
use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntArrayTag;
use pocketmine\nbt\tag\ListTag;
@ -45,7 +46,7 @@ class McRegion extends RegionWorldProvider{
/**
* @throws CorruptedChunkException
*/
protected function deserializeChunk(string $data) : ChunkData{
protected function deserializeChunk(string $data) : ?ChunkData{
$decompressed = @zlib_decode($data);
if($decompressed === false){
throw new CorruptedChunkException("Failed to decompress chunk NBT");
@ -61,6 +62,14 @@ class McRegion extends RegionWorldProvider{
throw new CorruptedChunkException("'Level' key is missing from chunk NBT");
}
$legacyGeneratedTag = $chunk->getTag("TerrainGenerated");
if($legacyGeneratedTag instanceof ByteTag && $legacyGeneratedTag->getValue() === 0){
//In legacy PM before 3.0, PM used to save MCRegion chunks even when they weren't generated. In these cases
//(we'll see them in old worlds), some of the tags which we expect to always be present, will be missing.
//If TerrainGenerated (PM-specific tag from the olden days) is false, toss the chunk data and don't bother
//trying to read it.
return null;
}
$subChunks = [];
$fullIds = self::readFixedSizeByteArray($chunk, "Blocks", 32768);
$fullData = self::readFixedSizeByteArray($chunk, "Data", 16384);

2
src/world/format/io/region/RegionWorldProvider.php
View File

@ -146,7 +146,7 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
/**
* @throws CorruptedChunkException
*/
abstract protected function deserializeChunk(string $data) : ChunkData;
abstract protected function deserializeChunk(string $data) : ?ChunkData;
/**
* @return CompoundTag[]