aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-05-17 12:07:22 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-05-17 12:07:22 +1000
commit7db09b10c98752d1092e9ace9460055d0b80ac6c (patch)
treefa76301c228796e215b6ff6ab9500ec6ad20f8d5 /src
parentbe850d4bcc620c6f30ab4723085a2b73b34e07fa (diff)
downloadGT5-Unofficial-7db09b10c98752d1092e9ace9460055d0b80ac6c.tar.gz
GT5-Unofficial-7db09b10c98752d1092e9ace9460055d0b80ac6c.tar.bz2
GT5-Unofficial-7db09b10c98752d1092e9ace9460055d0b80ac6c.zip
$ One more small fix for Pyro recipe conversion.
% Made Advanced Mufflers work as efficiently as their standard tier counterparts while there is no air filter. (Currently bugged)
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java7
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
index c56b9a09ef..0b22ea3acc 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
@@ -22,9 +22,16 @@ public final class AddGregtechRecipe {
int aModifiedTime = (int) (aRecipe.mDuration * 0.8);
+ if (aRecipe.mInputs == null || aRecipe.mFluidInputs == null || aRecipe.mFluidOutputs == null || aRecipe.mOutputs == null) {
+ return false;
+ }
+
if (aRecipe.mInputs.length > 2 || aRecipe.mFluidInputs.length > 1 || aRecipe.mFluidOutputs.length > 1 || aRecipe.mOutputs.length > 1) {
return false;
}
+ else if (aRecipe.mInputs.length <= 0 || aRecipe.mFluidInputs.length <= 0 || aRecipe.mFluidOutputs.length <= 0 || aRecipe.mOutputs.length <= 0) {
+ return false;
+ }
int aCircuitNumber = -1;
int aItemSlot = -1;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
index 4052a5c266..5fa1fc8aba 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
@@ -145,7 +145,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
double aVal1 = aPollution * Math.pow(0.64D, (double) (this.mTier - 1));
int aVal2 = (int) aVal1;
if (!hasValidFilter()) {
- aVal2 = 0;
+ aVal2 = (int) ((double) aPollution * Math.pow(0.7D, (double) (this.mTier - 1)));;
}
return aVal2;
}