handle empty sections

Querz · Jun 24, 2019 · ff5ccab · ff5ccab
1 parent 8cedf1e
commit ff5ccab
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/main/java/net/querz/nbt/mca/Chunk.java b/src/main/java/net/querz/nbt/mca/Chunk.java
@@ -73,7 +73,15 @@ private void initReferences() {
 		this.structures = level.getCompoundTag("Structures");
 		if (level.containsKey("Sections")) {
 			for (CompoundTag section : level.getListTag("Sections").asCompoundTagList()) {
-				this.sections[section.getByte("Y")] = new Section(section);
+				int sectionIndex = section.getByte("Y");
+				if (sectionIndex > 15 || sectionIndex < 0) {
+					continue;
+				}
+				Section newSection = new Section(section);
+				if (newSection.isEmpty()) {
+					continue;
+				}
+				this.sections[sectionIndex] = newSection;
 			}
 		}
 	}

diff --git a/src/main/java/net/querz/nbt/mca/Section.java b/src/main/java/net/querz/nbt/mca/Section.java
@@ -17,15 +17,19 @@ public class Section {
 	private byte[] skyLight;
 
 	public Section(CompoundTag sectionRoot) {
-		data = sectionRoot;
-		palette = sectionRoot.getListTag("Palette").asCompoundTagList();
+		ListTag<?> rawPalette = sectionRoot.getListTag("Palette");
+		if (rawPalette == null) {
+			return;
+		}
+		palette = rawPalette.asCompoundTagList();
 		for (int i = 0; i < palette.size(); i++) {
 			CompoundTag data = palette.get(i);
 			putValueIndexedPalette(data, i);
 		}
 		blockLight = sectionRoot.getByteArray("BlockLight");
 		blockStates = sectionRoot.getLongArray("BlockStates");
 		skyLight = sectionRoot.getByteArray("SkyLight");
+		data = sectionRoot;
 	}
 
 	Section() {}
@@ -72,6 +76,10 @@ private class PaletteIndex {
 		}
 	}
 
+	public boolean isEmpty() {
+		return data == null;
+	}
+
 	public CompoundTag getBlockStateAt(int blockX, int blockY, int blockZ) {
 		int index = getBlockIndex(blockX, blockY, blockZ);
 		int paletteIndex = getPaletteIndex(index);