From 8bcb3d9e0eb1ea4b40be5326649d01a8c9fee686 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Mon, 19 Oct 2020 06:09:54 -0400
Subject: [PATCH] Fix npe and cmod on parallax layer

---
 .../iris/gen/ParallaxTerrainProvider.java     | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java b/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java
index 17a2fd27a..82d7f3457 100644
--- a/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java
+++ b/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java
@@ -184,16 +184,19 @@ public abstract class ParallaxTerrainProvider extends TopographicTerrainProvider
 		return new AtomicSliverMap();
 	}
 
-	@Override
-	public List<BlockPopulator> getPopulators()
+	public void initGLUpdate()
 	{
-		List<BlockPopulator> g = new KList<>();
-
 		if(getGlUpdate() == null)
 		{
 			setGlUpdate(new GenLayerUpdate(this));
 		}
+	}
 
+	@Override
+	public List<BlockPopulator> getPopulators()
+	{
+		List<BlockPopulator> g = new KList<>();
+		initGLUpdate();
 		g.add(getGlUpdate());
 		return g;
 	}
@@ -447,11 +450,21 @@ public abstract class ParallaxTerrainProvider extends TopographicTerrainProvider
 	{
 		for(IrisStructurePlacement k : r.getStructures())
 		{
+			if(k == null)
+			{
+				continue;
+			}
+
 			k.place(this, random.nextParallelRNG(2228 * 2 * g++), i, j);
 		}
 
 		for(IrisStructurePlacement k : b.getStructures())
 		{
+			if(k == null)
+			{
+				continue;
+			}
+
 			k.place(this, random.nextParallelRNG(-22228 * 4 * g++), i, j);
 		}