aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/common/tileentities
diff options
context:
space:
mode:
authorpyure <pyure@hotmail.com>2015-09-28 18:55:23 -0400
committerpyure <pyure@hotmail.com>2015-09-28 18:55:23 -0400
commitfe24c662b2c6e75ec7863020181195768b0ebf49 (patch)
tree512dd8b48b65efb7ed4c7d99168d10e2cc11e007 /main/java/gregtech/common/tileentities
parent4d9fd9fb866bc630da970574eba276d1ba93586a (diff)
downloadGT5-Unofficial-fe24c662b2c6e75ec7863020181195768b0ebf49.tar.gz
GT5-Unofficial-fe24c662b2c6e75ec7863020181195768b0ebf49.tar.bz2
GT5-Unofficial-fe24c662b2c6e75ec7863020181195768b0ebf49.zip
Large Boilers now accept distilled water (w/o exploding)
Diffstat (limited to 'main/java/gregtech/common/tileentities')
-rw-r--r--main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java17
1 files changed, 11 insertions, 6 deletions
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index 93d8e260de..df129f8fd7 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -141,7 +141,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler
{
int tGeneratedEU = (int)(this.mEUt * 2L * this.mEfficiency / 10000L);
if (tGeneratedEU > 0) {
- if (depleteInput(Materials.Water.getFluid((tGeneratedEU + 160) / 160))) {
+ long amount = (tGeneratedEU + 160) / 160;
+ if (depleteInput(Materials.Water.getFluid(amount)) || depleteInput(GT_ModHandler.getDistilledWater(amount))) {
addOutput(GT_ModHandler.getSteam(tGeneratedEU));
} else {
explodeMultiblock();
@@ -257,8 +258,12 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
}
}
-
-/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar
- * Qualified Name: gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler
- * JD-Core Version: 0.7.0.1
- */ \ No newline at end of file
+
+
+/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar
+
+ * Qualified Name: gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler
+
+ * JD-Core Version: 0.7.0.1
+
+ */