From a319314d04d39cc9449e989e74eeb7889a0b56ac Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Thu, 29 Oct 2020 03:50:34 -0400
Subject: [PATCH] Fixes

---
 .idea/misc.xml                                        | 4 ----
 src/main/java/com/volmit/iris/gen/v2/IrisComplex.java | 4 +---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d44c4246f..602a0ddb7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,9 +7,5 @@
       </list>
     </option>
   </component>
-<<<<<<< Updated upstream
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="false" project-jdk-name="15" project-jdk-type="JavaSDK" />
-=======
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
->>>>>>> Stashed changes
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/volmit/iris/gen/v2/IrisComplex.java b/src/main/java/com/volmit/iris/gen/v2/IrisComplex.java
index 2c7591b06..db0962931 100644
--- a/src/main/java/com/volmit/iris/gen/v2/IrisComplex.java
+++ b/src/main/java/com/volmit/iris/gen/v2/IrisComplex.java
@@ -156,8 +156,6 @@ public class IrisComplex implements DataProvider
 			? seaBiomeStream.get(x, z) : landBiomeStream.get(x, z))
 			.convertAware2D(this::implode).cache2D(cacheSize);
 		heightStream = baseBiomeStream.convertAware2D((b, x, z) -> getHeight(b, x, z, seed))
-			.add(fluidHeight)
-			.add2D(overlayStream::get)
 				.roundDouble()
 			.cache2D(cacheSize);
 		slopeStream = heightStream.slope();
@@ -335,7 +333,7 @@ public class IrisComplex implements DataProvider
 			h += M.lerp(lo, hi, gen.getHeight(x, z, seed + 239945));
 		}
 
-		return h;
+		return h + fluidHeight + overlayStream.get(x,z);
 	}
 
 	private void registerGenerator(IrisGenerator cachedGenerator)