diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-01 00:25:23 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-01 00:25:23 +0200 |
| commit | b4e3f96c21b4aafe109d9925bc04c6c2a85f74c7 (patch) | |
| tree | 64568bee0623eefb5cb3389a30280793cb87b1b6 /main/java/gregtech/common | |
| parent | 183cfa6f066ea3fdec167227e9a3f075916edd14 (diff) | |
| parent | fe24c662b2c6e75ec7863020181195768b0ebf49 (diff) | |
| download | GT5-Unofficial-b4e3f96c21b4aafe109d9925bc04c6c2a85f74c7.tar.gz GT5-Unofficial-b4e3f96c21b4aafe109d9925bc04c6c2a85f74c7.tar.bz2 GT5-Unofficial-b4e3f96c21b4aafe109d9925bc04c6c2a85f74c7.zip | |
Merge pull request #199 from pyure/patch-3
Large Boilers now accept distilled water (w/o exploding)
Diffstat (limited to 'main/java/gregtech/common')
| -rw-r--r-- | main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java | 17 |
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
+
+ */
|