diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-09-21 17:56:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-21 17:56:14 +0200 |
| commit | e1f94bee22ea862e7c4f24821986e9e1f342cc9f (patch) | |
| tree | 9247c913e22670e801b1b923b35149b09d863f00 /src/main/java/gregtech/api/items | |
| parent | d0a9f79708361beb426f8cdd67d396e0c2fc415b (diff) | |
| parent | bf4510ad135645fe42a100a646e1828f06727c07 (diff) | |
| download | GT5-Unofficial-e1f94bee22ea862e7c4f24821986e9e1f342cc9f.tar.gz GT5-Unofficial-e1f94bee22ea862e7c4f24821986e9e1f342cc9f.tar.bz2 GT5-Unofficial-e1f94bee22ea862e7c4f24821986e9e1f342cc9f.zip | |
Merge pull request #660 from Minepolz320/experimental
Gregtech tools Fix
Diffstat (limited to 'src/main/java/gregtech/api/items')
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java | 13 |
1 files changed, 2 insertions, 11 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 82f19351a5..e157337148 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -463,18 +463,9 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements @Override public float getDigSpeed(ItemStack aStack, Block aBlock, int aMetaData) { - - if (!isItemStackUsable(aStack)) - return 0.0F; - + if (!isItemStackUsable(aStack)) return 0.0F; IToolStats tStats = getToolStats(aStack); - - if (tStats == null || Math.max(0, getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData)) - return 0.0F; - - if (aBlock.getHarvestLevel(aMetaData) == 0 && !tStats.isMinableBlock(aBlock, (byte) aMetaData)) - return Math.min(Math.max(Float.MIN_NORMAL, ((tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed) /2)),1.0F); - + 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; } |