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

fixed a bunch of NBT-related phpstan level 8 errors

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-07-05 20:59:47 +01:00
parent 68c408268c
commit 0188323d74
4 changed files with 12 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/world/format/io/data/JavaWorldData.php
View File

@ -93,10 +93,11 @@ class JavaWorldData extends BaseNbtWorldData{
throw new CorruptedWorldException($e->getMessage(), 0, $e);
}
if(!$worldData->hasTag("Data", CompoundTag::class)){
$dataTag = $worldData->getTag("Data");
if(!($dataTag instanceof CompoundTag)){
throw new CorruptedWorldException("Missing 'Data' key or wrong type");
}
return $worldData->getCompoundTag("Data");
return $dataTag;
}
protected function fix() : void{

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

@ -65,12 +65,11 @@ trait LegacyAnvilChunkTrait{
}catch(NbtDataException $e){
throw new CorruptedChunkException($e->getMessage(), 0, $e);
}
if(!$chunk->hasTag("Level")){
$chunk = $chunk->getTag("Level");
if(!($chunk instanceof CompoundTag)){
throw new CorruptedChunkException("'Level' key is missing from chunk NBT");
}
$chunk = $chunk->getCompoundTag("Level");
$subChunks = [];
$subChunksTag = $chunk->getListTag("Sections") ?? [];
foreach($subChunksTag as $subChunk){
@ -97,8 +96,8 @@ trait LegacyAnvilChunkTrait{
$chunk->getInt("xPos"),
$chunk->getInt("zPos"),
$subChunks,
$chunk->hasTag("Entities", ListTag::class) ? self::getCompoundList("Entities", $chunk->getListTag("Entities")) : [],
$chunk->hasTag("TileEntities", ListTag::class) ? self::getCompoundList("TileEntities", $chunk->getListTag("TileEntities")) : [],
($entitiesTag = $chunk->getTag("Entities")) instanceof ListTag ? self::getCompoundList("Entities", $entitiesTag) : [],
($tilesTag = $chunk->getTag("TileEntities")) instanceof ListTag ? self::getCompoundList("TileEntities", $tilesTag) : [],
$biomeArray
);
$result->setPopulated($chunk->getByte("TerrainPopulated", 0) !== 0);

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

@ -27,6 +27,7 @@ use pocketmine\block\BlockLegacyIds;
use pocketmine\nbt\BigEndianNbtSerializer;
use pocketmine\nbt\NbtDataException;
use pocketmine\nbt\tag\ByteArrayTag;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntArrayTag;
use pocketmine\nbt\tag\ListTag;
use pocketmine\world\format\BiomeArray;
@ -61,12 +62,11 @@ class McRegion extends RegionWorldProvider{
}catch(NbtDataException $e){
throw new CorruptedChunkException($e->getMessage(), 0, $e);
}
if(!$chunk->hasTag("Level")){
$chunk = $chunk->getTag("Level");
if(!($chunk instanceof CompoundTag)){
throw new CorruptedChunkException("'Level' key is missing from chunk NBT");
}
$chunk = $chunk->getCompoundTag("Level");
$subChunks = [];
$fullIds = $chunk->hasTag("Blocks", ByteArrayTag::class) ? $chunk->getByteArray("Blocks") : str_repeat("\x00", 32768);
$fullData = $chunk->hasTag("Data", ByteArrayTag::class) ? $chunk->getByteArray("Data") : str_repeat("\x00", 16384);
@ -93,8 +93,8 @@ class McRegion extends RegionWorldProvider{
$chunk->getInt("xPos"),
$chunk->getInt("zPos"),
$subChunks,
$chunk->hasTag("Entities", ListTag::class) ? self::getCompoundList("Entities", $chunk->getListTag("Entities")) : [],
$chunk->hasTag("TileEntities", ListTag::class) ? self::getCompoundList("TileEntities", $chunk->getListTag("TileEntities")) : [],
($entitiesTag = $chunk->getTag("Entities")) instanceof ListTag ? self::getCompoundList("Entities", $entitiesTag) : [],
($tilesTag = $chunk->getTag("TileEntities")) instanceof ListTag ? self::getCompoundList("TileEntities", $tilesTag) : [],
$biomeIds
);
$result->setPopulated($chunk->getByte("TerrainPopulated", 0) !== 0);