diff options
| author | David Vierra <codewarrior@hawaii.rr.com> | 2016-11-29 14:21:15 -1000 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2016-12-13 19:15:08 +0100 |
| commit | dcf348a7e11ec66470ca151e7e4e7576dc083810 (patch) | |
| tree | d73a247a84d41bb465ae6e5fe3fb1b7f50a88081 /src/main/java/gregtech | |
| parent | f98ce7ef0888c0929d4eba14ce3276854491decf (diff) | |
| download | GT5-Unofficial-dcf348a7e11ec66470ca151e7e4e7576dc083810.tar.gz GT5-Unofficial-dcf348a7e11ec66470ca151e7e4e7576dc083810.tar.bz2 GT5-Unofficial-dcf348a7e11ec66470ca151e7e4e7576dc083810.zip | |
Fix efficiency penalty incorrectly applied to large gas+plasma turbines
This is a copy-paste error from the original code in the large steam
turbine. `aOptFlow` is the optimal flow rate expressed in EU/t, while
`totalFlow` is expressed in fuel L/t
Diffstat (limited to 'src/main/java/gregtech')
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java index 3e3b7acf6a..ca00bd5239 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java @@ -112,7 +112,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT if (totalFlow != actualOptimalFlow) { float efficiency = 1.0f - Math.abs(((totalFlow - (float) actualOptimalFlow) / actualOptimalFlow)); - if(totalFlow>aOptFlow){efficiency = 1.0f;} + if(totalFlow>actualOptimalFlow){efficiency = 1.0f;} if (efficiency < 0) efficiency = 0; // Can happen with really ludicrously poor inefficiency. tEU *= efficiency; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index 28e3b7a172..5d5bf9ad54 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -127,7 +127,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar if (totalFlow != actualOptimalFlow) { float efficiency = 1.0f - Math.abs(((totalFlow - (float) actualOptimalFlow) / actualOptimalFlow)); - if(totalFlow>aOptFlow){efficiency = 1.0f;} + if(totalFlow>actualOptimalFlow){efficiency = 1.0f;} if (efficiency < 0) efficiency = 0; // Can happen with really ludicrously poor inefficiency. tEU *= efficiency; |