From dec1cb42185e5982947aeaeb2835004b3fe8598d Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 19 Oct 2014 14:03:24 +0200 Subject: [PATCH] Fix arrows with minimal textures crashing. #1101 --- src/main/java/tconstruct/items/tools/Arrow.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 35e610291bf..e5677a87b55 100644 --- 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); }