Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-26 02:29:14 +00:00
Code Issues Releases Activity

Fixed underwater structures not being waterlogged.

Browse Source
This commit is contained in:
Vatuu
2022-07-22 02:06:00 +02:00
parent 5e133fd51a
commit 95d755c2ec
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java
View File

@@ -83,7 +83,6 @@ public class PregeneratorJob implements PregenListener {
this.pregenerator = new IrisPregenerator(task, method, this);
max = new Position2(0, 0);
min = new Position2(0, 0);
KList<Runnable> draw = new KList<>();
task.iterateRegions((xx, zz) -> {
min.setX(Math.min(xx << 5, min.getX()));
min.setZ(Math.min(zz << 5, min.getZ()));

10
src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java
View File

@@ -169,10 +169,10 @@ public class LazyPregenerator extends Thread implements Listener
public static class LazyPregenJob
{
private String world;
private int healingPosition = 0;
private boolean healing = false;
private int chunksPerMinute = 32; // 48 hours is roughly 5000 radius
private int radiusBlocks = 5000;
private int position = 0;
@Builder.Default private int healingPosition = 0;
@Builder.Default private boolean healing = false;
@Builder.Default private int chunksPerMinute = 32; // 48 hours is roughly 5000 radius
@Builder.Default private int radiusBlocks = 5000;
@Builder.Default private int position = 0;
}
}

4
src/main/java/com/volmit/iris/engine/object/IrisObject.java
View File

@@ -799,7 +799,7 @@ public class IrisObject extends IrisRegistrant {
continue;
}
if(config.isWaterloggable() && yy <= placer.getFluidHeight() && data instanceof Waterlogged) {
if((config.isWaterloggable() || config.isUnderwater()) && yy <= placer.getFluidHeight() && data instanceof Waterlogged) {
((Waterlogged) data).setWaterlogged(true);
}
@@ -882,7 +882,7 @@ public class IrisObject extends IrisRegistrant {
int highest = placer.getHighest(xx, zz, getLoader(), true);
if(config.isWaterloggable() && highest <= placer.getFluidHeight() && d instanceof Waterlogged)
if((config.isWaterloggable() || config.isUnderwater()) && highest <= placer.getFluidHeight() && d instanceof Waterlogged)
((Waterlogged) d).setWaterlogged(true);
if(yv >= 0 && config.isBottom())