Fix #237

ChiselsAndBits · Feb 12, 2017 · 3248e3f · 3248e3f
1 parent cdbffb1
commit 3248e3f
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/main/java/mod/chiselsandbits/render/helpers/ModelUtil.java b/src/main/java/mod/chiselsandbits/render/helpers/ModelUtil.java
@@ -19,6 +19,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.init.Blocks;
@@ -177,7 +178,7 @@ private static List<BakedQuad> getModelQuads(
 
 		}
 
-		final IBakedModel secondModel = model.getOverrides().handleItemState( model, ModUtil.getItemFromBlock( state ), Minecraft.getMinecraft().theWorld, Minecraft.getMinecraft().thePlayer );
+		final IBakedModel secondModel = getOverrides( model ).handleItemState( model, ModUtil.getItemFromBlock( state ), Minecraft.getMinecraft().theWorld, Minecraft.getMinecraft().thePlayer );
 
 		if ( secondModel != null )
 		{
@@ -189,13 +190,23 @@ private static List<BakedQuad> getModelQuads(
 			{
 
 			}
-
 		}
 
 		// try to not crash...
 		return Collections.emptyList();
 	}
 
+	private static ItemOverrideList getOverrides(
+			final IBakedModel model )
+	{
+		if ( model != null )
+		{
+			final ItemOverrideList modelOverrides = model.getOverrides();
+			return modelOverrides == null ? ItemOverrideList.NONE : modelOverrides;
+		}
+		return ItemOverrideList.NONE;
+	}
+
 	private static void processFaces(
 			final HashMap<EnumFacing, ArrayList<ModelQuadLayerBuilder>> tmp,
 			final List<BakedQuad> quads )