diff options
| author | Sampsa <69092953+S4mpsa@users.noreply.github.com> | 2024-08-05 05:57:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-05 09:57:53 +0700 |
| commit | 92e27e131475b7ccc4a92b11721dd7c3d56788a2 (patch) | |
| tree | 71bd2224754ba625785730add44f1684842d5ec8 | |
| parent | 83189734085b2f20edf1972a9cdbdd8e76379c70 (diff) | |
| download | GT5-Unofficial-92e27e131475b7ccc4a92b11721dd7c3d56788a2.tar.gz GT5-Unofficial-92e27e131475b7ccc4a92b11721dd7c3d56788a2.tar.bz2 GT5-Unofficial-92e27e131475b7ccc4a92b11721dd7c3d56788a2.zip | |
Fix distillation towers voiding with ME output hatches (#2823)
* Fix distillation towers voiding with ME output hatches
* Now for Mega DT too!
* You learn something every day
3 files changed, 11 insertions, 5 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java index 80bc644e9e..48896ba418 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java @@ -408,9 +408,11 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock boolean foundMEHatch = false; for (IFluidStore tHatch : tLayerOutputHatches) { - if (tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME) { - foundMEHatch = true; - break; + if (tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME tMEHatch) { + if (tMEHatch.canAcceptFluid()) { + foundMEHatch = true; + break; + } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java index dfc3a4928d..1f5fec10f3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java @@ -308,7 +308,9 @@ public class GT_MetaTileEntity_DistillationTower extends return this.mOutputHatchesByLayer.stream() .allMatch( tLayerOutputHatches -> tLayerOutputHatches.stream() - .anyMatch(tHatch -> tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME)); + .anyMatch( + tHatch -> (tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME tMEHatch) + && (tMEHatch.canAcceptFluid()))); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java index 6a85e6f1b9..31dc25b65b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java @@ -456,7 +456,9 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends return this.mOutputHatchesByLayer.stream() .allMatch( tLayerOutputHatches -> tLayerOutputHatches.stream() - .anyMatch(tHatch -> tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME)); + .anyMatch( + tHatch -> (tHatch instanceof GT_MetaTileEntity_Hatch_Output_ME tMEHatch) + && (tMEHatch.canAcceptFluid()))); } @Override |