From c80f54cba794c653732e5cba1f329817d332070d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 19 Sep 2015 23:01:41 +0900
Subject: Chunk: allow generating unlighted maps for chunks without light data

---
 src/World/Chunk.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'src/World')

diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index dae66ff..f722655 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -99,8 +99,7 @@ void Chunk::parseChunk() {
 
 void Chunk::analyzeChunk() {
 	std::shared_ptr<const NBT::ByteTag> lightPopulatedTag = level->get<NBT::ByteTag>("LightPopulated");
-	if (!(lightPopulatedTag && lightPopulatedTag->getValue()))
-		throw std::invalid_argument("light data missing");
+	bool lightPopulated = lightPopulatedTag && lightPopulatedTag->getValue();
 
 	sections = assertValue(level->get<NBT::ListTag<NBT::CompoundTag>>("Sections"));
 	maxY = (assertValue(sections->back()->get<NBT::ByteTag>("Y"))->getValue() + 1) * SIZE;
@@ -126,18 +125,24 @@ void Chunk::analyzeChunk() {
 	for (auto &section : *sections) {
 		std::shared_ptr<const NBT::ByteArrayTag> blocks = assertValue(section->get<NBT::ByteArrayTag>("Blocks"));
 		std::shared_ptr<const NBT::ByteArrayTag> data = assertValue(section->get<NBT::ByteArrayTag>("Data"));
-		std::shared_ptr<const NBT::ByteArrayTag> blockLight = assertValue(section->get<NBT::ByteArrayTag>("BlockLight"));
-		std::shared_ptr<const NBT::ByteArrayTag> skyLight = assertValue(section->get<NBT::ByteArrayTag>("SkyLight"));
 		size_t Y = assertValue(section->get<NBT::ByteTag>("Y"))->getValue();
 
-		if (blocks->getLength() != SIZE*SIZE*SIZE || data->getLength() != SIZE*SIZE*SIZE/2
-		    || blockLight->getLength() != SIZE*SIZE*SIZE/2 || skyLight->getLength() != SIZE*SIZE*SIZE/2)
+		if (blocks->getLength() != SIZE*SIZE*SIZE || data->getLength() != SIZE*SIZE*SIZE/2)
 			throw std::invalid_argument("corrupt chunk data");
 
+		if (lightPopulated) {
+			std::shared_ptr<const NBT::ByteArrayTag> blockLight = assertValue(section->get<NBT::ByteArrayTag>("BlockLight"));
+			std::shared_ptr<const NBT::ByteArrayTag> skyLight = assertValue(section->get<NBT::ByteArrayTag>("SkyLight"));
+
+			if (blockLight->getLength() != SIZE*SIZE*SIZE/2 || skyLight->getLength() != SIZE*SIZE*SIZE/2)
+				throw std::invalid_argument("corrupt chunk data");
+
+			std::memcpy(blockBlockLight.get() + Y*SIZE*SIZE*SIZE/2, blockLight->getValue(), SIZE*SIZE*SIZE/2);
+			std::memcpy(blockSkyLight.get() + Y*SIZE*SIZE*SIZE/2, skyLight->getValue(), SIZE*SIZE*SIZE/2);
+		}
+
 		std::memcpy(blockIDs.get() + Y*SIZE*SIZE*SIZE, blocks->getValue(), SIZE*SIZE*SIZE);
 		std::memcpy(blockData.get() + Y*SIZE*SIZE*SIZE/2, data->getValue(), SIZE*SIZE*SIZE/2);
-		std::memcpy(blockBlockLight.get() + Y*SIZE*SIZE*SIZE/2, blockLight->getValue(), SIZE*SIZE*SIZE/2);
-		std::memcpy(blockSkyLight.get() + Y*SIZE*SIZE*SIZE/2, skyLight->getValue(), SIZE*SIZE*SIZE/2);
 	}
 }
 
-- 
cgit v1.2.3