diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index 596bbfb6b..bfa4dd7f5 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -21,6 +21,7 @@ package com.volmit.iris.engine; import com.google.common.util.concurrent.AtomicDouble; import com.google.gson.Gson; import com.volmit.iris.Iris; +import com.volmit.iris.core.ServerConfigurator; import com.volmit.iris.core.events.IrisEngineHotloadEvent; import com.volmit.iris.core.gui.PregeneratorJob; import com.volmit.iris.core.project.IrisProject; @@ -233,6 +234,10 @@ 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); } + }); } @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 b0f34e31d..0e0086b34 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.isAir(data)) { + if(stilting && i.getBlockY() < lowest && !B.isAirOrFluid(data)) { lowest = i.getBlockY(); } @@ -825,7 +825,7 @@ public class IrisObject extends IrisRegistrant { } - if(d == null || B.isAir(d)) { + if(d == null || B.isAirOrFluid(d)) { continue; }