From 8f37dc85702da3064b0555ee7da70b37cda0d1f3 Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor02@gmail.com>
Date: Wed, 21 Jul 2021 18:24:09 +0200
Subject: [PATCH] Cleanup & fix

---
 src/main/java/com/volmit/iris/core/TreeManager.java    | 10 ++++++++--
 .../volmit/iris/engine/object/IrisObjectPlacement.java |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/volmit/iris/core/TreeManager.java b/src/main/java/com/volmit/iris/core/TreeManager.java
index c593143dc..e5ee2967c 100644
--- a/src/main/java/com/volmit/iris/core/TreeManager.java
+++ b/src/main/java/com/volmit/iris/core/TreeManager.java
@@ -93,7 +93,7 @@ public class TreeManager implements Listener {
         IrisObject object = worldAccess.getData().getObjectLoader().load(placement.getPlace().getRandom(RNG.r));
 
         // Create object placer
-        IObjectPlacer placer = new IObjectPlacer(){
+        IObjectPlacer placer = new IObjectPlacer() {
 
             @Override
             public int getHighest(int x, int z) {
@@ -138,7 +138,13 @@ public class TreeManager implements Listener {
 
             @Override
             public int getFluidHeight() {
-                return ((Engine)worldAccess.getEngineAccess(event.getLocation().getBlockY())).getDimension().getFluidHeight();
+                Engine engine;
+                if (worldAccess.getCompound().getSize() > 1) {
+                    engine = worldAccess.getCompound().getEngine(0);
+                } else {
+                    engine = (Engine) worldAccess.getCompound().getRootDimension();
+                }
+                return engine.getDimension().getFluidHeight();
             }
 
             @Override
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
index c7f092b29..7ad941aa2 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
@@ -150,7 +150,7 @@ public class IrisObjectPlacement {
     @Desc("The loot tables to apply to these objects")
     private KList<IrisObjectLoot> loot = new KList<>();
 
-    @Desc("This objects overrides these trees when they grow...")
+    @Desc("This object / these objects override the following trees when they grow...")
     @ArrayType(min = 1, type = IrisTree.class)
     private KList<IrisTree> trees = new KList<>();