diff options
| author | Technus <daniel112092@gmail.com> | 2017-01-19 17:54:14 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-01-19 17:54:14 +0100 |
| commit | 03af99e7163b897d8b4745727b7f02d1a30e2a1e (patch) | |
| tree | c345f74525b959c89ca5cca622a49310b89cb44f /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | 8ba0ef316a83149478ee68bbc3037fbc0f7966b2 (diff) | |
| parent | a8217117fa8aa90ffa3b1eaaa811fcc4a6db99cd (diff) | |
| download | GT5-Unofficial-03af99e7163b897d8b4745727b7f02d1a30e2a1e.tar.gz GT5-Unofficial-03af99e7163b897d8b4745727b7f02d1a30e2a1e.tar.bz2 GT5-Unofficial-03af99e7163b897d8b4745727b7f02d1a30e2a1e.zip | |
Merge branch 'experimental' into eM
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index adb1678d85..20b8c57aba 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -473,7 +473,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { } } - ((GT_MetaGenerated_Tool) mInventory[1].getItem()).doDamage(mInventory[1], (long) Math.min(mEUt / this.damageFactorLow, Math.pow(mEUt, this.damageFactorHigh))); + ((GT_MetaGenerated_Tool) mInventory[1].getItem()).doDamage(mInventory[1], (long)getDamageToComponent(mInventory[1]) * (long) Math.min(mEUt / this.damageFactorLow, Math.pow(mEUt, this.damageFactorHigh))); if (mInventory[1].stackSize == 0) mInventory[1] = null; } } |