Prevent fiery NPEs with minimal texture bows when natura/tc is not pr…

…esent #1055
SlimeKnights · Oct 6, 2014 · 5933333 · 5933333
1 parent bd498aa
commit 5933333
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java
@@ -11,6 +11,7 @@
 import net.minecraft.world.World;
 import tconstruct.library.TConstructRegistry;
 import tconstruct.library.tools.BowstringMaterial;
+import tconstruct.library.tools.CustomMaterial;
 import tconstruct.tools.TinkerTools;
 
 public class Shortbow extends BowBase
@@ -43,8 +44,11 @@ public String getIconSuffix (int partType)
     @Override
     protected int getDefaultColor(int renderPass, int materialID) {
         // bowstring uses custom material
-        if(renderPass == 0)
-            return TConstructRegistry.getCustomMaterial(materialID, BowstringMaterial.class).color;
+        if(renderPass == 0) {
+            CustomMaterial mat = TConstructRegistry.getCustomMaterial(materialID, BowstringMaterial.class);
+            if(mat != null)
+                return mat.color;
+        }
 
         return super.getDefaultColor(renderPass, materialID);
     }