diff options
| author | Muramasa- <haydenkilloh@gmail.com> | 2016-09-28 05:45:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 05:45:30 +0100 |
| commit | 0ada20e86f2e1e6b4efb19c1980fb57a2d8d0f56 (patch) | |
| tree | 4cfb9307caec4914555c3b8108c0cb27d99f6d32 /src/main | |
| parent | d632ac2ab8250532cc067c1ea4d116c72bb298d3 (diff) | |
| download | GT5-Unofficial-0ada20e86f2e1e6b4efb19c1980fb57a2d8d0f56.tar.gz GT5-Unofficial-0ada20e86f2e1e6b4efb19c1980fb57a2d8d0f56.tar.bz2 GT5-Unofficial-0ada20e86f2e1e6b4efb19c1980fb57a2d8d0f56.zip | |
Fixes harvest crash
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/common/tools/GT_Tool_Axe.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java index 7affcaa7d4..f74aeca505 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java @@ -80,7 +80,7 @@ public class GT_Tool_Axe public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
- return ((tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood);
+ return ((tTool != null) && (tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood);
}
public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
|