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

Remove nonexistent NBT tags and fix movement issues in PC worlds

Browse Source
This commit is contained in:
Dylan K. Taylor 2016-12-02 18:06:36 +00:00
parent fb74d93e00
commit ebd2830770
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/level/format/anvil/Anvil.php
View File

@ -44,7 +44,6 @@ class Anvil extends McRegion{
$nbt->V = new ByteTag("V", 1);
$nbt->LastUpdate = new LongTag("LastUpdate", 0); //TODO
$nbt->InhabitedTime = new LongTag("InhabitedTime", 0); //TODO
$nbt->TerrainGenerated = new ByteTag("TerrainGenerated", $chunk->isGenerated());
$nbt->TerrainPopulated = new ByteTag("TerrainPopulated", $chunk->isPopulated());
$nbt->LightPopulated = new ByteTag("LightPopulated", $chunk->isLightPopulated());
@ -64,7 +63,7 @@ class Anvil extends McRegion{
]);
}
$nbt->BiomeColors = new IntArrayTag("BiomeColors", $chunk->getBiomeColorArray());
//$nbt->BiomeColors = new IntArrayTag("BiomeColors", $chunk->getBiomeColorArray());
$nbt->HeightMap = new IntArrayTag("HeightMap", $chunk->getHeightMapArray());
$entities = [];
@ -132,12 +131,12 @@ class Anvil extends McRegion{
$subChunks,
$chunk->Entities instanceof ListTag ? $chunk->Entities->getValue() : [],
$chunk->TileEntities instanceof ListTag ? $chunk->TileEntities->getValue() : [],
$chunk->BiomeColors instanceof IntArrayTag ? $chunk->BiomeColors->getValue() : [],
/*$chunk->BiomeColors instanceof IntArrayTag ? $chunk->BiomeColors->getValue() : */ [], //TODO: remove this and revert to the original PC Biomes array
$chunk->HeightMap instanceof IntArrayTag ? $chunk->HeightMap->getValue() : []
);
$result->setLightPopulated($chunk->LightPopulated instanceof ByteTag ? ((bool) $chunk->LightPopulated->getValue()) : false);
$result->setPopulated($chunk->TerrainPopulated instanceof ByteTag ? ((bool) $chunk->TerrainPopulated->getValue()) : false);
$result->setGenerated($chunk->TerrainGenerated instanceof ByteTag ? ((bool) $chunk->TerrainGenerated->getValue()) : false);
$result->setGenerated(true);
return $result;
}catch(\Throwable $e){
echo $e->getMessage();

7
src/pocketmine/level/format/mcregion/McRegion.php
View File

@ -43,7 +43,6 @@ class McRegion extends BaseLevelProvider{
$nbt->V = new ByteTag("V", 0); //guess
$nbt->LastUpdate = new LongTag("LastUpdate", 0); //TODO
$nbt->InhabitedTime = new LongTag("InhabitedTime", 0); //TODO
$nbt->TerrainGenerated = new ByteTag("TerrainGenerated", $chunk->isGenerated());
$nbt->TerrainPopulated = new ByteTag("TerrainPopulated", $chunk->isPopulated());
$nbt->LightPopulated = new ByteTag("LightPopulated", $chunk->isLightPopulated());
@ -68,7 +67,7 @@ class McRegion extends BaseLevelProvider{
$nbt->SkyLight = new ByteArrayTag("SkyLight", $skyLight);
$nbt->BlockLight = new ByteArrayTag("BlockLight", $blockLight);
$nbt->BiomeColors = new IntArrayTag("BiomeColors", $chunk->getBiomeColorArray());
//$nbt->BiomeColors = new IntArrayTag("BiomeColors", $chunk->getBiomeColorArray());
$nbt->HeightMap = new IntArrayTag("HeightMap", $chunk->getHeightMapArray());
$entities = [];
@ -155,12 +154,12 @@ class McRegion extends BaseLevelProvider{
$subChunks,
$chunk->Entities instanceof ListTag ? $chunk->Entities->getValue() : [],
$chunk->TileEntities instanceof ListTag ? $chunk->TileEntities->getValue() : [],
$chunk->BiomeColors instanceof IntArrayTag ? $chunk->BiomeColors->getValue() : [],
/*$chunk->BiomeColors instanceof IntArrayTag ? $chunk->BiomeColors->getValue() :*/ [],
$chunk->HeightMap instanceof IntArrayTag ? $chunk->HeightMap->getValue() : []
);
$result->setLightPopulated($chunk->LightPopulated instanceof ByteTag ? ((bool) $chunk->LightPopulated->getValue()) : false);
$result->setPopulated($chunk->TerrainPopulated instanceof ByteTag ? ((bool) $chunk->TerrainPopulated->getValue()) : false);
$result->setGenerated($chunk->TerrainGenerated instanceof ByteTag ? ((bool) $chunk->TerrainGenerated->getValue()) : false);
$result->setGenerated(true);
return $result;
}catch(\Throwable $e){
echo $e->getMessage();