From 44c707e0597bf706f32f74f29d50b36e78eb6e94 Mon Sep 17 00:00:00 2001
From: Vatuu <21113232+Vatuu@users.noreply.github.com>
Date: Mon, 16 May 2022 16:53:49 +0200
Subject: [PATCH] Stilting underwater works now.

---
 src/main/java/com/volmit/iris/engine/IrisEngine.java       | 5 +----
 .../java/com/volmit/iris/engine/object/IrisObject.java     | 7 +++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java
index bfa4dd7f5..049bd3e73 100644
--- a/src/main/java/com/volmit/iris/engine/IrisEngine.java
+++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java
@@ -234,10 +234,7 @@ public class IrisEngine implements Engine {
         getTarget().setDimension(getData().getDimensionLoader().load(getDimension().getLoadKey()));
         prehotload();
         setupEngine();
-        J.a(() -> {
-            Iris.warn("Meme.");
-            synchronized(ServerConfigurator.class) { ServerConfigurator.installDataPacks(false); }
-        });
+        J.a(() -> { synchronized(ServerConfigurator.class) { ServerConfigurator.installDataPacks(false); } });
     }
 
     @Override
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObject.java b/src/main/java/com/volmit/iris/engine/object/IrisObject.java
index 0e0086b34..8494e881c 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisObject.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisObject.java
@@ -719,7 +719,7 @@ public class IrisObject extends IrisRegistrant {
                 i = config.getRotation().rotate(i.clone(), spinx, spiny, spinz).clone();
                 i = config.getTranslate().translate(i.clone(), config.getRotation(), spinx, spiny, spinz).clone();
 
-                if(stilting && i.getBlockY() < lowest && !B.isAirOrFluid(data)) {
+                if(stilting && i.getBlockY() < lowest && !B.isAir(data)) {
                     lowest = i.getBlockY();
                 }
 
@@ -824,8 +824,7 @@ public class IrisObject extends IrisRegistrant {
                     continue;
                 }
 
-
-                if(d == null || B.isAirOrFluid(d)) {
+                if(d == null || B.isAir(d)) {
                     continue;
                 }
 
@@ -837,7 +836,7 @@ public class IrisObject extends IrisRegistrant {
                     zz += config.warp(rng, i.getZ() + z, i.getY() + y, i.getX() + x, getLoader());
                 }
 
-                int yg = placer.getHighest(xx, zz, getLoader(), config.isUnderwater());
+                int yg = placer.getHighest(xx, zz, getLoader(), true);
 
                 if(yv >= 0 && config.isBottom()) {
                     y += Math.floorDiv(h, 2);