upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix arrows with minimal textures crashing. #1101

Browse Source
This commit is contained in:
Bernhard Bonigl committed 2014-10-19 14:03:24 +02:00
1 parent ea46704872
commit dec1cb4218
1 file changed
+6 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/tconstruct/items/tools/Arrow.java
+6 -2
View File
@@ -11,6 +11,7 @@ import net.minecraft.world.World;
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 class Arrow extends ToolCore
@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);
}