From b0aad89e7af854d128000dd9d27aba27d9317e9b Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Tue, 29 Jul 2014 19:11:09 +0200 Subject: [PATCH] Fixed a few typos in McRegion --- src/pocketmine/level/format/mcregion/Chunk.php | 15 ++++----------- .../level/format/mcregion/RegionLoader.php | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/pocketmine/level/format/mcregion/Chunk.php b/src/pocketmine/level/format/mcregion/Chunk.php index b6f4cbd06..c9cc1d553 100644 --- a/src/pocketmine/level/format/mcregion/Chunk.php +++ b/src/pocketmine/level/format/mcregion/Chunk.php @@ -61,13 +61,6 @@ class Chunk extends BaseChunk{ $this->nbt->TileTicks->setTagType(NBT::TAG_Compound); } - if(isset($this->nbt->Sections) and $this->nbt->Sections instanceof Enum){ - $this->nbt->Sections->setTagType(NBT::TAG_Compound); - }else{ - $this->nbt->Sections = new Enum("Sections", []); - $this->nbt->Sections->setTagType(NBT::TAG_Compound); - } - if(!isset($this->nbt->Biomes) or !($this->nbt->Biomes instanceof ByteArray)){ $this->nbt->Biomes = new ByteArray("Biomes", str_repeat("\x01", 256)); } @@ -83,10 +76,10 @@ class Chunk extends BaseChunk{ $offset = 0; for($i = 0; $i < 256; ++$i){ - list($blocks[0][$i], $blocks[1][$i], $blocks[2][$i], $blocks[3][$i], $blocks[4][$i], $blocks[5][$i], $blocks[6][$i], $blocks[7][$i]) = str_split(substr($this->nbt->Blocks, $offset << 1, 128), 16); - list($datas[0][$i], $datas[1][$i], $datas[2][$i], $datas[3][$i], $datas[4][$i], $datas[5][$i], $datas[6][$i], $datas[7][$i]) = str_split(substr($this->nbt->Data, $offset, 64), 8); - list($skyLight[0][$i], $skyLight[1][$i], $skyLight[2][$i], $skyLight[3][$i], $skyLight[4][$i], $skyLight[5][$i], $skyLight[6][$i], $skyLight[7][$i]) = str_split(substr($this->nbt->SkyLight, $offset, 64), 8); - list($blockLight[0][$i], $blockLight[1][$i], $blockLight[2][$i], $blockLight[3][$i], $blockLight[4][$i], $blockLight[5][$i], $blockLight[6][$i], $blockLight[7][$i]) = str_split(substr($this->nbt->BlockLight, $offset, 64), 8); + list($blocks[0][$i], $blocks[1][$i], $blocks[2][$i], $blocks[3][$i], $blocks[4][$i], $blocks[5][$i], $blocks[6][$i], $blocks[7][$i]) = str_split(substr($this->nbt["Blocks"], $offset << 1, 128), 16); + list($datas[0][$i], $datas[1][$i], $datas[2][$i], $datas[3][$i], $datas[4][$i], $datas[5][$i], $datas[6][$i], $datas[7][$i]) = str_split(substr($this->nbt["Data"], $offset, 64), 8); + list($skyLight[0][$i], $skyLight[1][$i], $skyLight[2][$i], $skyLight[3][$i], $skyLight[4][$i], $skyLight[5][$i], $skyLight[6][$i], $skyLight[7][$i]) = str_split(substr($this->nbt["SkyLight"], $offset, 64), 8); + list($blockLight[0][$i], $blockLight[1][$i], $blockLight[2][$i], $blockLight[3][$i], $blockLight[4][$i], $blockLight[5][$i], $blockLight[6][$i], $blockLight[7][$i]) = str_split(substr($this->nbt["BlockLight"], $offset, 64), 8); $offset += 64; } diff --git a/src/pocketmine/level/format/mcregion/RegionLoader.php b/src/pocketmine/level/format/mcregion/RegionLoader.php index 860eeea43..40d27b5f4 100644 --- a/src/pocketmine/level/format/mcregion/RegionLoader.php +++ b/src/pocketmine/level/format/mcregion/RegionLoader.php @@ -149,7 +149,7 @@ class RegionLoader{ $nbt->BiomeColors = new IntArray("BiomeColors", array_fill(0, 256, Binary::readInt("\x00\x85\xb2\x4a"))); $nbt->Blocks = new ByteArray("Blocks", str_repeat("\x00", 32768)); - $nbt->Blocks = new ByteArray("Data", $half = str_repeat("\x00", 16384)); + $nbt->Data = new ByteArray("Data", $half = str_repeat("\x00", 16384)); $nbt->SkyLight = new ByteArray("SkyLight", $half); $nbt->BlockLight = new ByteArray("BlockLight", $half);