From 9f3e5fea38ddc3e31486c2b4eda0924bd0b2d5c2 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Sun, 25 Oct 2020 12:30:05 -0400
Subject: [PATCH] Height fixes

---
 .../volmit/iris/gen/TopographicTerrainProvider.java |  5 +++++
 .../com/volmit/iris/gen/atomics/AtomicSliver.java   | 13 ++++++++++++-
 .../volmit/iris/gen/v2/IrisTerrainGenerator.java    |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java b/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java
index 18363d153..b6a9e2220 100644
--- a/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java
+++ b/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java
@@ -340,6 +340,11 @@ public abstract class TopographicTerrainProvider extends ParallelTerrainProvider
 			}
 		}
 
+		if(Math.max(height, fluidHeight) > 255)
+		{
+			return height;
+		}
+		
 		block = sliver.get(Math.max(height, fluidHeight));
 
 		// Decorate True Surface
diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java
index 2489072a2..8dd634304 100644
--- a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java
+++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java
@@ -87,7 +87,18 @@ public class AtomicSliver
 		{
 			return null;
 		}
-		FastBlockData b = block[h < 256 ? h : 256];
+
+		if(h > 255)
+		{
+			h = 255;
+		}
+
+		if(h < 0)
+		{
+			h = 0;
+		}
+
+		FastBlockData b = block[h];
 		last = M.ms();
 
 		if(b == null)
diff --git a/src/main/java/com/volmit/iris/gen/v2/IrisTerrainGenerator.java b/src/main/java/com/volmit/iris/gen/v2/IrisTerrainGenerator.java
index a2ed36214..8caef4cdd 100644
--- a/src/main/java/com/volmit/iris/gen/v2/IrisTerrainGenerator.java
+++ b/src/main/java/com/volmit/iris/gen/v2/IrisTerrainGenerator.java
@@ -27,7 +27,7 @@ public class IrisTerrainGenerator
 	{
 		complex.flash(seed, dimension, data);
 	}
-	
+
 	public void generate(int x, int z, Hunk<BlockData> blocks, Hunk<Biome> biomes)
 	{
 		// RNG rng = new RNG((((long) x) << 32) | (z & 0xffffffffL));