Fix mask NPE when ExtendedBlock gets initially used at 0 0 0

Author: TBlueF

core/src/main/java/de/bluecolored/bluemap/core/world/block/ExtendedBlock.java

@@ -45,7 +45,7 @@ public class ExtendedBlock implements BlockAccess {
 
     private @Nullable BlockProperties properties;
 
-    private Mask renderMask;
+    private @Nullable Mask renderMask;
     private final MaskArea maskArea = new MaskArea();
 
     private boolean insideRenderBoundsCalculated, insideRenderBounds;
@@ -71,11 +71,7 @@ public void set(int x, int y, int z) {
         this.properties = null;
         this.insideRenderBoundsCalculated = false;
         this.isCaveCalculated = false;
-
-        if (renderMask == null || !maskArea.isInside(x, z)) {
-            maskArea.setAround(x, z);
-            renderMask = maskArea.apply(renderSettings.getRenderMask());
-        }
+        if (!maskArea.isInside(x, z)) this.renderMask = null;
     }
 
     @Override
@@ -138,10 +134,18 @@ public BlockProperties getProperties() {
         return properties;
     }
 
+    private Mask getRenderMask() {
+        if (renderMask == null) {
+            maskArea.setAround(x, z);
+            renderMask = maskArea.apply(renderSettings.getRenderMask());
+        }
+        return renderMask;
+    }
+
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public boolean isInsideRenderBounds() {
         if (!insideRenderBoundsCalculated) {
-            insideRenderBounds = renderMask.test(getX(), getY(), getZ());
+            insideRenderBounds = getRenderMask().test(getX(), getY(), getZ());
             insideRenderBoundsCalculated = true;
         }
 
@@ -165,6 +169,10 @@ public boolean isRemoveIfCave() {
     private static class MaskArea {
         private int minX, minZ, maxX, maxZ;
 
+        public MaskArea() {
+            setAround(0, 0);
+        }
+
         public boolean isInside(int x, int z) {
             return
                     x >= minX && x <= maxX &&