Fix Natura crashing on startup. Closes #378.

progwml6 · Jul 8, 2017 · c534e2a · c534e2a
1 parent f2f7bc9
commit c534e2a
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/src/main/java/com/progwml6/natura/decorative/DecorativeClientProxy.java b/src/main/java/com/progwml6/natura/decorative/DecorativeClientProxy.java
@@ -29,32 +29,50 @@ protected void registerModels()
     {
         for (Block block : NaturaDecorative.fenceGates)
         {
-            ModelLoader.setCustomStateMapper(block, (new StateMap.Builder()).ignore(BlockFenceGate.POWERED).build());
+            if (block != null)
+            {
+                ModelLoader.setCustomStateMapper(block, (new StateMap.Builder()).ignore(BlockFenceGate.POWERED).build());
+            }
         }
 
         for (Block block : NaturaDecorative.buttons)
         {
-            registerItemModel(block);
+            if (block != null)
+            {
+                registerItemModel(block);
+            }
         }
 
         for (Block block : NaturaDecorative.pressurePlates)
         {
-            registerItemModel(block);
+            if (block != null)
+            {
+                registerItemModel(block);
+            }
         }
 
         for (Block block : NaturaDecorative.trapDoors)
         {
-            registerItemModel(block);
+            if (block != null)
+            {
+                registerItemModel(block);
+            }
         }
 
         for (Block block : NaturaDecorative.fences)
         {
-            registerItemModel(block);
+            if (block != null)
+            {
+                registerItemModel(block);
+            }
         }
 
         for (Block block : NaturaDecorative.fenceGates)
         {
-            registerItemModel(block);
+            if (block != null)
+            {
+                registerItemModel(block);
+            }
         }
 
         registerItemBlockMeta(NaturaDecorative.overworldBookshelves);