Fix cave mod engine npe

This commit is contained in:
cyberpwn
2022-09-12 17:26:14 -04:00
parent 7528bd343b
commit 251c52a2ee
@@ -157,7 +157,7 @@ public class IrisCarveModifier extends EngineAssignedModifier<BlockData> {
if(i == buf + 1) { if(i == buf + 1) {
buf = i; buf = i;
zone.ceiling = buf; 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)); processZone(output, mc, mantle, zone, rx, rz, rx + (x << 4), rz + (z << 4));
zone = new CaveZone(); zone = new CaveZone();
zone.setFloor(i); 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)); 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; return (ceiling - floor) - 1;
} }
public boolean isValid() { public boolean isValid(Engine engine) {
return floor < ceiling && ceiling - floor >= 1 && floor >= 0 && ceiling <= IrisContext.get().getEngine().getHeight() && airThickness() > 0; return floor < ceiling && ceiling - floor >= 1 && floor >= 0 && ceiling <= engine.getHeight() && airThickness() > 0;
} }
public String toString() { public String toString() {