diff options
| author | Muramasa- <haydenkilloh@gmail.com> | 2016-09-28 05:45:30 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2016-09-28 13:22:46 +0200 |
| commit | 0570c23ea677c20776acb55f39f69fccff198af3 (patch) | |
| tree | 51f339d0d1b605c9309d1068e017a41bc93961e1 /src | |
| parent | 5fbfa73be95ca08250259b59cb7ee4ccff4d23a0 (diff) | |
| download | GT5-Unofficial-0570c23ea677c20776acb55f39f69fccff198af3.tar.gz GT5-Unofficial-0570c23ea677c20776acb55f39f69fccff198af3.tar.bz2 GT5-Unofficial-0570c23ea677c20776acb55f39f69fccff198af3.zip | |
Fixes harvest crash
Diffstat (limited to 'src')
| -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) {
|