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 @@
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
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);
}
}