fix: biome data not being null when no biomes are set

cafestube · Sep 8, 2024 · 92e89c4 · 92e89c4
1 parent feff00f
commit 92e89c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "eu.cafestube"
-version = "2.0.3-SNAPSHOT"
+version = "2.0.4-SNAPSHOT"
 
 allprojects {
     repositories {

diff --git a/src/main/java/eu/cafestube/schematics/version/V3SchematicVersion.java b/src/main/java/eu/cafestube/schematics/version/V3SchematicVersion.java
@@ -42,19 +42,25 @@ public Schematic deserialize(CompoundBinaryTag compound) {
 
         Map<BlockPos, BlockEntity> blockEntityMap = V2SchematicVersion.parseBlockEntities(dataVersion, blocksTag);
 
-        CompoundBinaryTag biomesTag = compound.getCompound("Biomes");
-        CompoundBinaryTag biomePaletteTag = biomesTag.getCompound("Palette");
-        Map<Integer, String> biomePalette = StreamSupport.stream(biomePaletteTag.spliterator(), true)
-                .collect(Collectors.toMap(stringObjectEntry -> ((IntBinaryTag) stringObjectEntry.getValue()).value(), Map.Entry::getKey));
-        byte[] biomeData = biomesTag.getByteArray("Data");
+
+        BiomeData biomeData = null;
+        if(compound.get("Biomes") != null) {
+            CompoundBinaryTag biomesTag = compound.getCompound("Biomes");
+            CompoundBinaryTag biomePaletteTag = biomesTag.getCompound("Palette");
+            Map<Integer, String> biomePalette = StreamSupport.stream(biomePaletteTag.spliterator(), true)
+                    .collect(Collectors.toMap(stringObjectEntry -> ((IntBinaryTag) stringObjectEntry.getValue()).value(), Map.Entry::getKey));
+            byte[] biomeDataBytes = biomesTag.getByteArray("Data");
+
+            biomeData = new BiomeData(biomePalette, biomeDataBytes, BiomeDataType.THREE_DIMENSIONAL);
+        }
 
 
         ListBinaryTag entitiesTag = compound.getList("Entities");
         List<Entity> entities = V2SchematicVersion.parseEntities(entitiesTag);
 
 
         return new Schematic(dataVersion, width, height, length, metadata, offset, blockPalette, blockData,
-                blockEntityMap, entities, new BiomeData(biomePalette, biomeData, BiomeDataType.THREE_DIMENSIONAL));
+                blockEntityMap, entities, biomeData);
     }
 
     @Override