Fix arrows with minimal textures crashing. #1101

SlimeKnights · Oct 19, 2014 · dec1cb4 · dec1cb4
1 parent ea46704
commit dec1cb4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java
@@ -11,6 +11,7 @@
 import tconstruct.library.TConstructRegistry;
 import tconstruct.library.crafting.ToolBuilder;
 import tconstruct.library.tools.BowstringMaterial;
+import tconstruct.library.tools.CustomMaterial;
 import tconstruct.library.tools.FletchingMaterial;
 import tconstruct.library.tools.ToolCore;
 import tconstruct.tools.TinkerTools;
@@ -47,8 +48,11 @@ public String getIconSuffix (int partType)
     @Override
     protected int getDefaultColor(int renderPass, int materialID) {
         // fletchling uses custom material
-        if(renderPass == 2)
-            return TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class).color;
+        if(renderPass == 2) {
+            CustomMaterial mat = TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class);
+            if(mat != null)
+                return mat.color;
+        }
 
         return super.getDefaultColor(renderPass, materialID);
     }