Add null-check to BlockState#foreach

TBlueF · TBlueF · commit 086ca6f65a09 · 2025-08-05T13:12:24.000+02:00
diff --git a/core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/blockstate/BlockState.java b/core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/blockstate/BlockState.java
@@ -57,8 +57,8 @@ public Multipart getMultipart() {
     }
 
     public void forEach(Consumer<Variant> consumer) {
-        variants.forEach(consumer);
-        multipart.forEach(consumer);
+        if (variants != null) variants.forEach(consumer);
+        if (multipart != null) multipart.forEach(consumer);
     }
 
     public void forEach(de.bluecolored.bluemap.core.world.BlockState blockState, int x, int y, int z, Consumer<Variant> consumer) {

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ public Multipart getMultipart() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public void forEach(Consumer<Variant> consumer) {`
`60`		`- variants.forEach(consumer);`
`61`		`- multipart.forEach(consumer);`
	`60`	`+ if (variants != null) variants.forEach(consumer);`
	`61`	`+ if (multipart != null) multipart.forEach(consumer);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public void forEach(de.bluecolored.bluemap.core.world.BlockState blockState, int x, int y, int z, Consumer<Variant> consumer) {`