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

Fix McRegion read corruption errors, close #232

Browse Source 
According to the wiki, McRegion heightmap should be ByteArray, not
IntArray. This caused issues with converted worlds with pretty much
every conversion tool. Blame @shoghicp.

IntArray McRegion heightmaps will now be converted to
ByteArray on save.
This commit is contained in:
Dylan K. Taylor 2017-01-08 21:12:33 +00:00
parent 02ddcef24e
commit 8902992473
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/level/format/io/region/McRegion.php
View File

@ -84,7 +84,7 @@ class McRegion extends BaseLevelProvider{
$nbt->BlockLight = new ByteArrayTag("BlockLight", $blockLight);
$nbt->Biomes = new ByteArrayTag("Biomes", $chunk->getBiomeIdArray());
$nbt->HeightMap = new IntArrayTag("HeightMap", $chunk->getHeightMapArray());
$nbt->HeightMap = new ByteArrayTag("HeightMap", pack("C*", ...$chunk->getHeightMapArray()));
$entities = [];
@ -176,6 +176,15 @@ class McRegion extends BaseLevelProvider{
$biomeIds = "";
}
$heightMap = [];
if(isset($chunk->HeightMap)){
if($chunk->HeightMap instanceof ByteArrayTag){
$heightMap = unpack("C*", $chunk->HeightMap->getValue());
}elseif($chunk->HeightMap instanceof IntArrayTag){
$heightMap = $chunk->HeightMap->getValue(); #blameshoghicp
}
}
$result = new Chunk(
$this,
$chunk["xPos"],
@ -184,7 +193,7 @@ class McRegion extends BaseLevelProvider{
isset($chunk->Entities) ? $chunk->Entities->getValue() : [],
isset($chunk->TileEntities) ? $chunk->TileEntities->getValue() : [],
$biomeIds,
isset($chunk->HeightMap) ? $chunk->HeightMap->getValue() : [] //this shouldn't exist in normal mcregion worlds anyway...
$heightMap
);
$result->setLightPopulated(isset($chunk->LightPopulated) ? ((bool) $chunk->LightPopulated->getValue()) : false);
$result->setPopulated(isset($chunk->TerrainPopulated) ? ((bool) $chunk->TerrainPopulated->getValue()) : false);