From 251c52a2eeebc993cb59f8854a6258fd164255a9 Mon Sep 17 00:00:00 2001
From: cyberpwn <danielmillst@gmail.com>
Date: Mon, 12 Sep 2022 17:26:14 -0400
Subject: [PATCH] Fix cave mod engine npe

---
 .../volmit/iris/engine/modifier/IrisCarveModifier.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java
index b22c6df49..693688c7d 100644
--- a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java
+++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java
@@ -157,7 +157,7 @@ public class IrisCarveModifier extends EngineAssignedModifier<BlockData> {
                 if(i == buf + 1) {
                     buf = i;
                     zone.ceiling = buf;
-                } else if(zone.isValid()) {
+                } else if(zone.isValid(getEngine())) {
                     processZone(output, mc, mantle, zone, rx, rz, rx + (x << 4), rz + (z << 4));
                     zone = new CaveZone();
                     zone.setFloor(i);
@@ -165,7 +165,7 @@ public class IrisCarveModifier extends EngineAssignedModifier<BlockData> {
                 }
             }
 
-            if(zone.isValid()) {
+            if(zone.isValid(getEngine())) {
                 processZone(output, mc, mantle, zone, rx, rz, rx + (x << 4), rz + (z << 4));
             }
         });
@@ -276,8 +276,8 @@ public class IrisCarveModifier extends EngineAssignedModifier<BlockData> {
             return (ceiling - floor) - 1;
         }
 
-        public boolean isValid() {
-            return floor < ceiling && ceiling - floor >= 1 && floor >= 0 && ceiling <= IrisContext.get().getEngine().getHeight() && airThickness() > 0;
+        public boolean isValid(Engine engine) {
+            return floor < ceiling && ceiling - floor >= 1 && floor >= 0 && ceiling <= engine.getHeight() && airThickness() > 0;
         }
 
         public String toString() {