diff options
| author | HoleFish <48403212+HoleFish@users.noreply.github.com> | 2024-10-31 10:41:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-31 02:41:34 +0000 |
| commit | 6ccfe285f0d5dc5fe2536f6aa46410ac57c00917 (patch) | |
| tree | a0d17bc208f1d95d22f85a1913eeb8479281d4b3 | |
| parent | 5ac1df7018ec085d1894a5b4e3e46c20e20e118f (diff) | |
| download | GT5-Unofficial-6ccfe285f0d5dc5fe2536f6aa46410ac57c00917.tar.gz GT5-Unofficial-6ccfe285f0d5dc5fe2536f6aa46410ac57c00917.tar.bz2 GT5-Unofficial-6ccfe285f0d5dc5fe2536f6aa46410ac57c00917.zip | |
Fix mabs crash when breaking energy hatches (#3425)
2 files changed, 3 insertions, 13 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java index 3d35af461d..526883aa29 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java @@ -16,9 +16,6 @@ import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static gregtech.api.util.GTStructureUtility.ofCoil; import static gregtech.api.util.GTUtility.validMTEList; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -263,14 +260,6 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTE } @Override - public List<MTEHatch> getExoticAndNormalEnergyHatchList() { - List<MTEHatch> tHatches = new ArrayList<>(); - tHatches.addAll(mExoticEnergyHatches); - tHatches.addAll(mEnergyHatches); - return tHatches; - } - - @Override public void construct(ItemStack stackSize, boolean hintsOnly) { buildPiece("main", stackSize, hintsOnly, 5, 16, 0); } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java index d5d5a92ad3..5020533663 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java @@ -9,6 +9,7 @@ import static gregtech.api.enums.HatchElement.Muffler; import static gregtech.api.enums.HatchElement.OutputBus; import static gregtech.api.enums.HatchElement.OutputHatch; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; +import static gregtech.api.util.GTUtility.filterValidMTEs; import static gregtech.api.util.GTUtility.validMTEList; import static java.lang.Math.min; import static tectech.thing.casing.BlockGTCasingsTT.texturePage; @@ -1691,8 +1692,8 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT @Override public List<MTEHatch> getExoticAndNormalEnergyHatchList() { List<MTEHatch> list = new ArrayList<>(); - list.addAll(mEnergyHatches); - list.addAll(eEnergyMulti); + list.addAll(filterValidMTEs(mEnergyHatches)); + list.addAll(filterValidMTEs(eEnergyMulti)); return list; } |