aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-08-22 23:01:29 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2016-08-22 23:01:29 +0200
commit49e5b5370631e306f19ef4e0b0cc885eb44cb006 (patch)
tree7d6796c1fb49cf6247c016d3561f5f5f2be70f7d /src/main
parent9ff430c80de2b37a92e8ef67abf525a29f77ef44 (diff)
downloadGT5-Unofficial-49e5b5370631e306f19ef4e0b0cc885eb44cb006.tar.gz
GT5-Unofficial-49e5b5370631e306f19ef4e0b0cc885eb44cb006.tar.bz2
GT5-Unofficial-49e5b5370631e306f19ef4e0b0cc885eb44cb006.zip
#573 Turbines now explode when producing more EU than dynamo can handle
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java4
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 621eb6498b..8fd31a9d5d 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;
}
}