From 95d755c2ec208e5d62200cda00cfa970a386b04a Mon Sep 17 00:00:00 2001
From: Vatuu <21113232+Vatuu@users.noreply.github.com>
Date: Fri, 22 Jul 2022 02:06:00 +0200
Subject: [PATCH] Fixed underwater structures not being waterlogged.

---
 .../java/com/volmit/iris/core/gui/PregeneratorJob.java |  1 -
 .../iris/core/pregenerator/LazyPregenerator.java       | 10 +++++-----
 .../java/com/volmit/iris/engine/object/IrisObject.java |  4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java b/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java
index 66137de22..a7ade2bcb 100644
--- a/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java
+++ b/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java
@@ -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()));
diff --git a/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java b/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java
index e0b9a0c16..9d7f2aa25 100644
--- a/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java
+++ b/src/main/java/com/volmit/iris/core/pregenerator/LazyPregenerator.java
@@ -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;
     }
 }
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 5a5c2c059..6e48d08a8 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisObject.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisObject.java
@@ -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())