From 6cb48e76a81923af55a720b771cba4dfb35bfc3c Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Thu, 15 Oct 2020 23:47:32 -0400
Subject: [PATCH] Fix npes

---
 .idea/jarRepositories.xml                           |  5 +++++
 .../Maven__io_lumine_xikage_MythicMobs_4_9_1.xml    | 13 +++++++++++++
 Iris.iml                                            |  1 +
 .../volmit/iris/gen/ParallaxTerrainProvider.java    |  7 +++++--
 src/main/java/com/volmit/iris/util/B.java           |  5 +++++
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 .idea/libraries/Maven__io_lumine_xikage_MythicMobs_4_9_1.xml

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 02fe0b3e4..de1207135 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,10 @@
       <option name="name" value="CodeMC" />
       <option name="url" value="https://repo.codemc.org/repository/maven-public" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="nexus" />
+      <option name="name" value="Lumine Releases" />
+      <option name="url" value="https://mvn.lumine.io/repository/maven-public/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_lumine_xikage_MythicMobs_4_9_1.xml b/.idea/libraries/Maven__io_lumine_xikage_MythicMobs_4_9_1.xml
new file mode 100644
index 000000000..60ccbf29b
--- /dev/null
+++ b/.idea/libraries/Maven__io_lumine_xikage_MythicMobs_4_9_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.lumine.xikage:MythicMobs:4.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/lumine/xikage/MythicMobs/4.9.1/MythicMobs-4.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/lumine/xikage/MythicMobs/4.9.1/MythicMobs-4.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/lumine/xikage/MythicMobs/4.9.1/MythicMobs-4.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/Iris.iml b/Iris.iml
index e156f43ab..08cba5f26 100644
--- a/Iris.iml
+++ b/Iris.iml
@@ -33,6 +33,7 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit.craftbukkit:cb-1.14.4:1.14.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.bstats:bstats-bukkit:1.7" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.lumine.xikage:MythicMobs:4.9.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
   </component>
diff --git a/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java b/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java
index 8d7bafde3..16ca78755 100644
--- a/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java
+++ b/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java
@@ -353,9 +353,12 @@ public abstract class ParallaxTerrainProvider extends TopographicTerrainProvider
 			placeObject(k, i, j, random.nextParallelRNG((34 * ((i * 30) + (j * 30) + g++) * i * j) + i - j + 3566522));
 		}
 
-		for(IrisObjectPlacement k : r.getSurfaceObjects())
+		if(r != null)
 		{
-			placeObject(k, i, j, random.nextParallelRNG((34 * ((i * 30) + (j * 30) + g++) * i * j) + i - j + 3569222));
+			for(IrisObjectPlacement k : r.getSurfaceObjects())
+			{
+				placeObject(k, i, j, random.nextParallelRNG((34 * ((i * 30) + (j * 30) + g++) * i * j) + i - j + 3569222));
+			}
 		}
 
 		return g;
diff --git a/src/main/java/com/volmit/iris/util/B.java b/src/main/java/com/volmit/iris/util/B.java
index 094443796..b20e2d5c1 100644
--- a/src/main/java/com/volmit/iris/util/B.java
+++ b/src/main/java/com/volmit/iris/util/B.java
@@ -490,6 +490,11 @@ public class B
 
 	public static boolean isAir(BlockData d)
 	{
+		if(d == null)
+		{
+			return true;
+		}
+
 		return d.getMaterial().equals(Material.AIR) || d.getMaterial().equals(Material.CAVE_AIR) || d.getMaterial().equals(Material.VOID_AIR);
 	}
 }