diff options
| author | Technus <daniel112092@gmail.com> | 2016-12-01 14:18:04 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-12-01 14:18:04 +0100 |
| commit | 0291dbd90b6db6709f8ba602f66c6d2fe03a5a6c (patch) | |
| tree | 342162fab5e95f076e87597c842426093b0028d3 /src/main/java/gregtech/api | |
| parent | 2534d2ca4cd23f013c0eb05398af997942a6a05a (diff) | |
| download | GT5-Unofficial-0291dbd90b6db6709f8ba602f66c6d2fe03a5a6c.tar.gz GT5-Unofficial-0291dbd90b6db6709f8ba602f66c6d2fe03a5a6c.tar.bz2 GT5-Unofficial-0291dbd90b6db6709f8ba602f66c6d2fe03a5a6c.zip | |
May or may not fix wire burning again.
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 11 |
1 files changed, 8 insertions, 3 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 82cdac0e04..8d7dd61599 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 @@ -44,6 +44,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile public long mRestRF; public short mOverheat,mLastOverheat=10; public static short mMaxOverheat=(short) (GT_Mod.gregtechproxy.mWireHeatingTicks * 100); + public long lastTick=0,tickDiff; public GT_MetaPipeEntity_Cable(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial, long aCableLossPerMeter, long aAmperage, long aVoltage, boolean aInsulated, boolean aCanShock) { super(aID, aName, aNameRegional, 0); @@ -213,9 +214,11 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile mOverheat+=(Math.max(100,100*(GT_Utility.getTier(aVoltage)-GT_Utility.getTier(mVoltage)))); didOverheat=true; } - if (mTransferredAmperage > mAmperage) { - if(mLastOverheat<=5) - mOverheat+=(100*(mTransferredAmperage-mAmperage)); + if (mTransferredAmperage > (mAmperage*tickDiff)) { + if(mLastOverheat<=5) { + + mOverheat += (100 * (mTransferredAmperage - mAmperage)); + } didOverheat=true; } if(mOverheat>mMaxOverheat && mLastOverheat<=0) @@ -235,6 +238,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile mTransferredVoltage=0; mTransferredAmperageOK=mTransferredAmperage; mTransferredAmperage = 0; + tickDiff=aTick-lastTick; + lastTick=aTick; if(mOverheat>0)mOverheat--; if(mLastOverheat>0)mLastOverheat--; if (aTick % 20 == 0) { |