diff options
| author | Blood-Asp <Blood@Asp> | 2015-09-05 00:46:03 +0200 |
|---|---|---|
| committer | Blood-Asp <Blood@Asp> | 2015-09-05 00:46:03 +0200 |
| commit | 31c80e0078b2c32f550b9e2e7aa55a728e619010 (patch) | |
| tree | d8df90239e72f5cd2bd6ce2ddf2944b7c65346c5 | |
| parent | 0cb1cbd6bc66294a6c3dfbcc14f6b4e57563e06d (diff) | |
| parent | 683d46f4c86aeb4314d683b2f90c104d694b839a (diff) | |
| download | GT5-Unofficial-31c80e0078b2c32f550b9e2e7aa55a728e619010.tar.gz GT5-Unofficial-31c80e0078b2c32f550b9e2e7aa55a728e619010.tar.bz2 GT5-Unofficial-31c80e0078b2c32f550b9e2e7aa55a728e619010.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java | 6 |
1 files changed, 6 insertions, 0 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 af799b8ab9..7fd38a78a2 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,9 +72,15 @@ 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. +<<<<<<< HEAD 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 +======= + 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 +>>>>>>> origin/master 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 remainingFlow -= flow; // track amount we're allowed to continue depleting from hatches |