aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-09-28 14:05:10 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2016-09-30 22:30:02 +0200
commit7079dccb8c4fd3f194ba0cf24031c50e278171cc (patch)
tree4bfd519822e46d9a37e2edf8b79da943de94c877 /src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
parentc283f7fe36c72edd3099f0e12256e85b345c2ac0 (diff)
downloadGT5-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_Plunger.java')
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Plunger.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
index 678e694fc5..4b13d15875 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
@@ -43,7 +43,7 @@ public class GT_Tool_Plunger
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
- return (tTool.equals("plunger"));
+ return ((tTool != null) && tTool.equals("plunger"));
}
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {