diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-09-28 14:05:10 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2016-09-30 22:30:02 +0200 |
| commit | 7079dccb8c4fd3f194ba0cf24031c50e278171cc (patch) | |
| tree | 4bfd519822e46d9a37e2edf8b79da943de94c877 /src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java | |
| parent | c283f7fe36c72edd3099f0e12256e85b345c2ac0 (diff) | |
| download | GT5-Unofficial-7079dccb8c4fd3f194ba0cf24031c50e278171cc.tar.gz GT5-Unofficial-7079dccb8c4fd3f194ba0cf24031c50e278171cc.tar.bz2 GT5-Unofficial-7079dccb8c4fd3f194ba0cf24031c50e278171cc.zip | |
Fix short distance teleport & readd null check on tools
Diffstat (limited to 'src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java')
| -rw-r--r-- | src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java index 7aa5d4dce6..7cefcdfd8d 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java @@ -60,7 +60,7 @@ public class GT_Tool_BranchCutter public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
- return ((tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves);
+ return ((tTool != null) && (tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves);
}
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
|