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

Fixed stilting with edited data.

Browse Source
This commit is contained in:
Vatuu
2022-05-16 17:49:49 +02:00
parent ccc2ed0806
commit 5a4ca2f907
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/engine/object/IrisObject.java
+22 -6
View File
@@ -820,13 +820,27 @@ 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(i.getBlockY() != lowest) { if(i.getBlockY() != lowest)
continue; continue;
for(IrisObjectReplace j : config.getEdit()) {
if(rng.chance(j.getChance())) {
for(BlockData k : j.getFind(rdata)) {
if(j.isExact() ? k.matches(d) : k.getMaterial().equals(d.getMaterial())) {
BlockData newData = j.getReplace(rng, i.getX() + x, i.getY() + y, i.getZ() + z, rdata).clone();
if(newData.getMaterial() == d.getMaterial()) {
d = d.merge(newData);
} else {
d = newData;
}
}
}
}
} }
if(d == null || B.isAir(d)) { if(d == null || B.isAir(d))
continue; continue;
}
xx = x + (int) Math.round(i.getX()); xx = x + (int) Math.round(i.getX());
zz = z + (int) Math.round(i.getZ()); zz = z + (int) Math.round(i.getZ());
@@ -838,6 +852,10 @@ public class IrisObject extends IrisRegistrant {
int yg = placer.getHighest(xx, zz, getLoader(), true); int yg = placer.getHighest(xx, zz, getLoader(), true);
if(config.isWaterloggable() && yg <= placer.getFluidHeight() && d instanceof Waterlogged) {
((Waterlogged) d).setWaterlogged(true);
}
if(yv >= 0 && config.isBottom()) { if(yv >= 0 && config.isBottom()) {
y += Math.floorDiv(h, 2); y += Math.floorDiv(h, 2);
} }
@@ -1117,7 +1135,5 @@ public class IrisObject extends IrisRegistrant {
} }
@Override @Override
public void scanForErrors(JSONObject p, VolmitSender sender) { public void scanForErrors(JSONObject p, VolmitSender sender) { }
}
} }