diff options
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 15 |
1 files changed, 9 insertions, 6 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 388f56edbb..17cdaec07a 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 @@ -257,7 +257,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile long worldTick = aBaseMetaTileEntity.getWorld().getTotalWorldTime(); int tickDiff = (int) (worldTick - lastWorldTick); lastWorldTick = worldTick; - int ampsAvr=lastAmperage[15]=mTransferredAmperage; + lastAmperage[15]=mTransferredAmperage; + int ampOverheat=mTransferredAmperage-((int)mAmperage<<4); if (tickDiff >= 16) { for (int i = 0; i <= 14; i++) lastAmperage[i]=0; } else { @@ -266,11 +267,15 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile if(tickDiff>0){ lastAmperage[i]=0; }else{ - ampsAvr+=lastAmperage[i]; + ampOverheat+=lastAmperage[i]; } } } - if (ampsAvr > (mAmperage<<4)) mOverheat+=100*(ampsAvr-(mAmperage<<4)); + + if (ampOverheat > 0) { + mOverheat+=100*ampOverheat; + lastAmperage[15]-=ampOverheat; + } } if(mOverheat>=mMaxOverheat) { @@ -279,9 +284,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile //}else{ aBaseMetaTileEntity.setToFire(); //} - }else if (mOverheat>0){ - mOverheat--; - } + }else if (mOverheat>0) mOverheat--; mTransferredVoltageOK=mTransferredVoltage; mTransferredVoltage=0; |