mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-19 07:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stilting underwater works now.

Browse Source
This commit is contained in:
Vatuu
2022-05-16 16:53:49 +02:00
parent e7c458de3f
commit 44c707e059
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/engine/IrisEngine.java
+1 -4
View File
@@ -234,10 +234,7 @@ public class IrisEngine implements Engine {
getTarget().setDimension(getData().getDimensionLoader().load(getDimension().getLoadKey())); getTarget().setDimension(getData().getDimensionLoader().load(getDimension().getLoadKey()));
prehotload(); prehotload();
setupEngine(); setupEngine();
J.a(() -> { J.a(() -> { synchronized(ServerConfigurator.class) { ServerConfigurator.installDataPacks(false); } });
Iris.warn("Meme.");
synchronized(ServerConfigurator.class) { ServerConfigurator.installDataPacks(false); }
});
} }
@Override @Override
src/main/java/com/volmit/iris/engine/object/IrisObject.java
+3 -4
View File
@@ -719,7 +719,7 @@ public class IrisObject extends IrisRegistrant {
i = config.getRotation().rotate(i.clone(), spinx, spiny, spinz).clone(); i = config.getRotation().rotate(i.clone(), spinx, spiny, spinz).clone();
i = config.getTranslate().translate(i.clone(), config.getRotation(), 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(); lowest = i.getBlockY();
} }
@@ -824,8 +824,7 @@ public class IrisObject extends IrisRegistrant {
continue; continue;
} }
if(d == null || B.isAir(d)) {
if(d == null || B.isAirOrFluid(d)) {
continue; continue;
} }
@@ -837,7 +836,7 @@ public class IrisObject extends IrisRegistrant {
zz += config.warp(rng, i.getZ() + z, i.getY() + y, i.getX() + x, getLoader()); 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()) { if(yv >= 0 && config.isBottom()) {
y += Math.floorDiv(h, 2); y += Math.floorDiv(h, 2);