From 1f8d2464a03ac8c49a10d1af1b30f672fbd93914 Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Sun, 26 Mar 2023 00:32:33 +0100 Subject: [PATCH] Fix possible NPE if BlockElement is null --- .../core/resources/resourcepack/blockmodel/BlockModel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resources/resourcepack/blockmodel/BlockModel.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resources/resourcepack/blockmodel/BlockModel.java index d4a5994c..b3cf7dd3 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resources/resourcepack/blockmodel/BlockModel.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resources/resourcepack/blockmodel/BlockModel.java @@ -61,7 +61,7 @@ public class BlockModel { if (this.elements != null) { for (var element : elements) { - element.optimize(resourcePack); + if (element != null) element.optimize(resourcePack); } } } @@ -86,6 +86,7 @@ public class BlockModel { if (this.elements == null && parent.elements != null) { this.elements = new Element[parent.elements.length]; for (int i = 0; i < this.elements.length; i++){ + if (parent.elements[i] == null) continue; this.elements[i] = parent.elements[i].copy(); } } @@ -101,7 +102,7 @@ public class BlockModel { public synchronized void calculateProperties(ResourcePack resourcePack) { if (elements == null) return; for (Element element : elements) { - if (element.isFullCube()) { + if (element != null && element.isFullCube()) { occluding = true; culling = true;