diff options
author | Caedis <Caedis@users.noreply.github.com> | 2024-01-12 13:53:09 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-12 13:53:09 -0600 |
commit | ba1a9b290a09e39b100ff8d9f1f5e70cdc3f0fab (patch) | |
tree | 3895304c8c934ba84b93a6ab427f5fa0546200ac /src/main/java/gregtech/api/items | |
parent | a3adb6c9e2b0093b3e6ed6f2d4ce9c0ae5fe3520 (diff) | |
download | GT5-Unofficial-ba1a9b290a09e39b100ff8d9f1f5e70cdc3f0fab.tar.gz GT5-Unofficial-ba1a9b290a09e39b100ff8d9f1f5e70cdc3f0fab.tar.bz2 GT5-Unofficial-ba1a9b290a09e39b100ff8d9f1f5e70cdc3f0fab.zip |
Allow tools to break stuff with a lower harvest level (#2435)
* Allow tools to break stuff with a lower harvest level
* Dont allow drops of improper tool usage
Diffstat (limited to 'src/main/java/gregtech/api/items')
-rw-r--r-- | src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index de6ca996d5..2526faa0aa 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -686,12 +686,13 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item if (tStats == null || Math.max(0, getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData)) return 0.0F; return tStats.isMinableBlock(aBlock, (byte) aMetaData) ? Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed) - : 0.0F; + : 1.0F; } @Override public final boolean canHarvestBlock(Block aBlock, ItemStack aStack) { - return getDigSpeed(aStack, aBlock, (byte) 0) > 0.0F; + IToolStats tStats = getToolStats(aStack); + return tStats.isMinableBlock(aBlock, (byte) 0) && getDigSpeed(aStack, aBlock, (byte) 0) > 0.0F; } @Override |