Merge pull request #57 from Thorfusion/TurbineGUI

Fixes #40
Thorfusion · Nov 21, 2022 · 7d45e4c · 7d45e4c
2 parents e076dbe + 3fe4c84
commit 7d45e4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java
@@ -315,7 +315,7 @@ public void readConfig(ByteBuf dataStream) throws IOException
 		generators.ethanolMultiplier = dataStream.readDouble();
 		generators.heatGeneration = dataStream.readDouble();
 		generators.heatGenerationLava = dataStream.readDouble();
-		generators.heatGenerationNether = dataStream.readDouble();;
+		generators.heatGenerationNether = dataStream.readDouble();
 		generators.heatGenerationFluidRate = dataStream.readInt();
 		generators.heatGenEnable = dataStream.readBoolean();
 		generators.solarGeneration = dataStream.readDouble();

diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java
@@ -76,8 +76,8 @@ public void onUpdate()
 						setEnergy(getEnergy()+((int)rate)*energyMultiplier);
 
 						structure.fluidStored.amount -= rate;
-						structure.clientFlow = Math.min((int)rate, structure.condensers*generators.condenserRate);
-						structure.flowRemaining = (int)rate;
+						structure.clientFlow = (int)rate;
+						structure.flowRemaining = Math.min((int)rate, structure.condensers*generators.condenserRate);
 
 						if(structure.fluidStored.amount == 0)
 						{