Default to white if a tool has a material that doesn't exist anymore

SlimeKnights · Feb 7, 2015 · 58031bb · 58031bb
1 parent 3cd211e
commit 58031bb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java
@@ -685,7 +685,10 @@ protected int getCorrectColor(ItemStack stack, int renderPass, NBTTagCompound ta
 
     protected int getDefaultColor(int renderPass, int materialID)
     {
-        return TConstructRegistry.getMaterial(materialID).primaryColor();
+        if(TConstructRegistry.getMaterial(materialID) != null)
+            return TConstructRegistry.getMaterial(materialID).primaryColor();
+
+        return 0xffffffff;
     }
 
     @Override