diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-08-22 23:01:29 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-08-23 18:42:23 +0200 |
| commit | cff73fd5a356c951f2210008af5c7b323d8b6e91 (patch) | |
| tree | e663e70ced076e944b851c42bacca3516e02d405 /src | |
| parent | 1fc13df5107f134052af2717896f3f91b91eee45 (diff) | |
| download | GT5-Unofficial-cff73fd5a356c951f2210008af5c7b323d8b6e91.tar.gz GT5-Unofficial-cff73fd5a356c951f2210008af5c7b323d8b6e91.tar.bz2 GT5-Unofficial-cff73fd5a356c951f2210008af5c7b323d8b6e91.zip | |
#573 Turbines now explode when producing more EU than dynamo can handle
Diffstat (limited to 'src')
2 files changed, 5 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 9003e441f5..08bac989e3 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 @@ -496,7 +496,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { if (aEU <= 0) return true; for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { if (isValidMetaTileEntity(tHatch)) { - if (tHatch.getBaseMetaTileEntity().increaseStoredEnergyUnits(aEU, false)) { + if (tHatch.getBaseMetaTileEntity().increaseStoredEnergyUnits(aEU, true)) { return true; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index 4db8598796..cf345b0669 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -162,6 +162,10 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M } else { this.mMaxProgresstime = 1; this.mEfficiencyIncrease = (10); + if(this.mDynamoHatches.size()>0){ + if(this.mDynamoHatches.get(0).getBaseMetaTileEntity().getOutputVoltage() < (mEUt * mEfficiency) / 10000){ + explodeMultiblock();} + } return true; } } |