From 81ce84b3f10e7222b7c0c25afa78ee36d4d6bf07 Mon Sep 17 00:00:00 2001
From: Vatuu <21113232+Vatuu@users.noreply.github.com>
Date: Thu, 3 Mar 2022 22:13:15 +0100
Subject: [PATCH] Made IrisEffect dependent on world's minimum height.

---
 build.gradle                                           |  1 +
 .../java/com/volmit/iris/engine/object/IrisEffect.java | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index a07276981..8aeda8d1e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,6 +39,7 @@ registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins'
 registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins')
 registerCustomOutputTask('Coco', 'D://Documents/MC/plugins')
 registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins')
+registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.18.1/plugins')
 // ========================== UNIX ==============================
 registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/Documents/development/server/plugins')
 registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins')
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEffect.java b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java
index c335d1fdf..6a426b8fe 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisEffect.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java
@@ -209,8 +209,9 @@ public class IrisEffect {
 
             part.setY(Math.round(g.getHeight(part.getBlockX(), part.getBlockZ())) + 1);
             part.add(RNG.r.d(), 0, RNG.r.d());
+            int offset = p.getWorld().getMinHeight();
             if(extra != 0) {
-                J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() - 64 + RNG.r.i(particleOffset),
+                J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset),
                     part.getZ(),
                     particleCount,
                     randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
@@ -218,7 +219,7 @@ public class IrisEffect {
                     randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ,
                     extra));
             } else {
-                J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() - 64 + RNG.r.i(particleOffset), part.getZ(),
+                J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset), part.getZ(),
                     particleCount,
                     randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
                     randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY,
@@ -266,8 +267,9 @@ public class IrisEffect {
         if(particleEffect != null) {
             Location part = p.getLocation().clone().add(0, 0.25, 0).add(new Vector(1, 1, 1).multiply(RNG.r.d())).subtract(new Vector(1, 1, 1).multiply(RNG.r.d()));
             part.add(RNG.r.d(), 0, RNG.r.d());
+            int offset = p.getWorld().getMinHeight();
             if(extra != 0) {
-                J.s(() -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() -64 + RNG.r.i(particleOffset),
+                J.s(() -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset),
                     part.getZ(),
                     particleCount,
                     randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
@@ -275,7 +277,7 @@ public class IrisEffect {
                     randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ,
                     extra));
             } else {
-                J.s(() -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() -64 + RNG.r.i(particleOffset), part.getZ(),
+                J.s(() -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset), part.getZ(),
                     particleCount,
                     randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
                     randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY,