diff options
author | Technus <daniel112092@gmail.com> | 2017-09-15 07:03:15 +0200 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-09-15 07:03:15 +0200 |
commit | 24544eff29ff7810f107f35f74cd6a716c3d49b6 (patch) | |
tree | d870c1aefdb2d363c36fe8834fc19efd122382fc /src/main/java/gregtech/api/metatileentity/implementations | |
parent | f6f17e1553b2b0ba75c6b8be829a8b7a374b7fcf (diff) | |
download | GT5-Unofficial-24544eff29ff7810f107f35f74cd6a716c3d49b6.tar.gz GT5-Unofficial-24544eff29ff7810f107f35f74cd6a716c3d49b6.tar.bz2 GT5-Unofficial-24544eff29ff7810f107f35f74cd6a716c3d49b6.zip |
bug fix
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index 30acde3788..678a437a78 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -255,8 +255,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile long worldTick = aBaseMetaTileEntity.getWorld().getTotalWorldTime(); int tickDiff = (int) (worldTick - lastWorldTick); lastWorldTick = worldTick; - int ampOverheat=mTransferredAmperage-((int)mAmperage*(15+tickDiff));//16+tickDiff-1 - lastAmperage[15]=mTransferredAmperage-((int)mAmperage*(tickDiff-1)); + int ampOverheat=mTransferredAmperageOK-((int)mAmperage*16);//16+tickDiff-1 if (tickDiff >= 16) { for (int i = 0; i <= 14; i++) lastAmperage[i]=0; } else { @@ -269,6 +268,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile } } } + lastAmperage[15]=mTransferredAmperageOK; if (ampOverheat > 0) { mOverheat+=100*ampOverheat; lastAmperage[15]-=ampOverheat; |