make newMCAFile public / check if palette is null

Querz · May 4, 2020 · ea6ef16 · ea6ef16
1 parent 5d80a38
commit ea6ef16
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/net/querz/mca/MCAUtil.java b/src/main/java/net/querz/mca/MCAUtil.java
@@ -191,7 +191,7 @@ public static int chunkToBlock(int chunk) {
 
 	private static final Pattern mcaFilePattern = Pattern.compile("^.*r\\.(?<regionX>-?\\d+)\\.(?<regionZ>-?\\d+)\\.mca$");
 
-	private static MCAFile newMCAFile(File file) {
+	public static MCAFile newMCAFile(File file) {
 		Matcher m = mcaFilePattern.matcher(file.getName());
 		if (m.find()) {
 			return new MCAFile(Integer.parseInt(m.group("regionX")), Integer.parseInt(m.group("regionZ")));

diff --git a/src/main/java/net/querz/mca/Section.java b/src/main/java/net/querz/mca/Section.java
@@ -371,10 +371,18 @@ public static Section newSection() {
 	 */
 	public CompoundTag updateHandle(int y) {
 		data.putByte("Y", (byte) y);
-		data.put("Palette", palette);
-		if (blockLight != null) data.putByteArray("BlockLight", blockLight);
-		data.putLongArray("BlockStates", blockStates);
-		if (skyLight != null) data.putByteArray("SkyLight", skyLight);
+		if (palette != null) {
+			data.put("Palette", palette);
+		}
+		if (blockLight != null) {
+			data.putByteArray("BlockLight", blockLight);
+		}
+		if (blockStates != null) {
+			data.putLongArray("BlockStates", blockStates);
+		}
+		if (skyLight != null) {
+			data.putByteArray("SkyLight", skyLight);
+		}
 		return data;
 	}
 }