diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-08-30 17:26:36 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-08-30 17:26:36 +0200 |
| commit | 683d46f4c86aeb4314d683b2f90c104d694b839a (patch) | |
| tree | 1815bf6539a331fe81fb5b913caa3c9b0efdc7bd /main/java/gregtech/common | |
| parent | 4263f3b43f1009df01574ce84c4dcc8e8aeed82c (diff) | |
| parent | 08b28cbb655e68f3f524dd9b9f28356b1423f420 (diff) | |
| download | GT5-Unofficial-683d46f4c86aeb4314d683b2f90c104d694b839a.tar.gz GT5-Unofficial-683d46f4c86aeb4314d683b2f90c104d694b839a.tar.bz2 GT5-Unofficial-683d46f4c86aeb4314d683b2f90c104d694b839a.zip | |
Merge pull request #156 from InfinityStudio/master
Fixed large steam turbine do not consume steam.
Diffstat (limited to 'main/java/gregtech/common')
| -rw-r--r-- | main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java index 535069b333..e6c252c43e 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java @@ -72,8 +72,8 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg int remainingFlow = (int) (aOptFlow * 1.25f); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for multi-hatch scenarios. for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { // loop through each hatch; extract inputs and track totals. - if (aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)).equals("fluid.steam") - || aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)).equals("ic2.fluidSteam")) { + String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)); + if (fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam") || fluidName.equals("fluid.mfr.steam.still.name")) { flow = aFluids.get(i).amount; // Get all (steam) in hatch flow = Math.min(flow, Math.min(remainingFlow, (int) (aOptFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount |