diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-08-14 02:56:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-14 02:56:43 +0200 |
| commit | 9d0470ac20ae37833e78297e7c9234ba97117fc4 (patch) | |
| tree | 496501aa2d262e7a68829f8f0be60a3a57dc74f6 /src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java | |
| parent | ee665937950eb1983c23e19e8f7191d46e603235 (diff) | |
| parent | 38e2e1512bb91c3535729250f828d8078c88a91d (diff) | |
| download | GT5-Unofficial-9d0470ac20ae37833e78297e7c9234ba97117fc4.tar.gz GT5-Unofficial-9d0470ac20ae37833e78297e7c9234ba97117fc4.tar.bz2 GT5-Unofficial-9d0470ac20ae37833e78297e7c9234ba97117fc4.zip | |
Merge pull request #197 from GTNewHorizons/NEI-Tier
fixes "scythe bug"
Diffstat (limited to 'src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java')
| -rw-r--r-- | src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java index 6691e3ffa0..1627b22fa5 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java @@ -98,7 +98,7 @@ public class GT_Tool_HardHammer public boolean isMinableBlock(Block aBlock, byte aMetaData) { String tTool = aBlock.getHarvestTool(aMetaData); - return (tTool == null || tTool.isEmpty() || ((tTool.equals("hammer")) || (tTool.equals("pickaxe")))) || (aBlock.getMaterial() == Material.rock) || (aBlock.getMaterial() == Material.glass) || (aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce) || (GT_Recipe.GT_Recipe_Map.sHammerRecipes.containsInput(new ItemStack(aBlock, 1, aMetaData))); + return aBlock.getHarvestLevel(aMetaData) != -1 && (tTool == null || tTool.isEmpty() || ((tTool.equals("hammer")) || (tTool.equals("pickaxe")))) || (aBlock.getMaterial() == Material.rock) || (aBlock.getMaterial() == Material.glass) || (aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce) || (GT_Recipe.GT_Recipe_Map.sHammerRecipes.containsInput(new ItemStack(aBlock, 1, aMetaData))); } 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) { |