diff options
author | Alkalus <Draknyte1@hotmail.com> | 2020-04-14 20:20:53 +0100 |
---|---|---|
committer | Alkalus <Draknyte1@hotmail.com> | 2020-04-14 20:20:53 +0100 |
commit | 994cb1962434737cf3cfadc06361db2f2cec2020 (patch) | |
tree | dd96160d195653e79ceaf6f18b982f4f5f5a265d /src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity | |
parent | 807c856a641cfba29c2159941f16e3991940e699 (diff) | |
parent | e724a728061ec4a78cff73a4a2dd46eea4af4521 (diff) | |
download | GT5-Unofficial-994cb1962434737cf3cfadc06361db2f2cec2020.tar.gz GT5-Unofficial-994cb1962434737cf3cfadc06361db2f2cec2020.tar.bz2 GT5-Unofficial-994cb1962434737cf3cfadc06361db2f2cec2020.zip |
Merge branch 'master' of https://bitbucket.org/draknyte1/gtpp-development into MillingRecipes
# Conflicts:
# src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity')
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java | 7 |
1 files changed, 3 insertions, 4 deletions
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 5fa1fc8aba..5303a42bf6 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 @@ -124,7 +124,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch return false; } - public boolean polluteEnvironment() { + public boolean polluteEnvironment() { if (airCheck() && damageAirFilter()) { int aEmission = this.calculatePollutionReduction(10000); PollutionUtils.addPollution(this.getBaseMetaTileEntity(), aEmission); @@ -214,8 +214,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch //Logger.INFO("Empty - "+this.mInventory.length); } else { - //Logger.INFO("D2"); - Logger.INFO("Has Item"); + //Logger.INFO("D2"); } } //Logger.INFO("A4"); @@ -254,7 +253,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch //Remove broken Filter if ((filter.getItemDamage() == 0 && currentUse >= 50-1) || (filter.getItemDamage() == 1 && currentUse >= 2500-1)){ breakAirFilter(); - return false; + return true; } else { //Do Damage |