diff options
| author | Martin Robertz <dream-master@gmx.net> | 2019-04-11 12:00:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 12:00:39 +0200 |
| commit | f0c353ee28ea8cf082f9f184a94dfd4350ab488a (patch) | |
| tree | 258fbb1091239d1cdf20f10bf2a7624a7a8288a9 /src/main/java/gregtech/api/items | |
| parent | f5f9d29c848705effe4414c2ed39ce118430476c (diff) | |
| parent | e414699ba059cf137c5faed74b1caa1c489414a5 (diff) | |
| download | GT5-Unofficial-f0c353ee28ea8cf082f9f184a94dfd4350ab488a.tar.gz GT5-Unofficial-f0c353ee28ea8cf082f9f184a94dfd4350ab488a.tar.bz2 GT5-Unofficial-f0c353ee28ea8cf082f9f184a94dfd4350ab488a.zip | |
Merge pull request #182 from GTNewHorizons/bmf
Bmf
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, 11 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 9c3b4a8ae5..db0db134ff 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -462,9 +462,18 @@ 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 (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);
+
return tStats.isMinableBlock(aBlock, (byte) aMetaData) ? Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed) : 0.0F;
}
|