diff options
author | miozune <miozune@gmail.com> | 2022-12-19 18:10:08 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-19 10:10:08 +0100 |
commit | d554223fc52408d1a5170cdfbc547fba25b670d3 (patch) | |
tree | b91e723cad859b2384d17b8c18cd9c25fbf33cb0 /src/main/java/gregtech/api | |
parent | 154d8a2b3ed15a5a20ac5e5448faab286c2edc3c (diff) | |
download | GT5-Unofficial-d554223fc52408d1a5170cdfbc547fba25b670d3.tar.gz GT5-Unofficial-d554223fc52408d1a5170cdfbc547fba25b670d3.tar.bz2 GT5-Unofficial-d554223fc52408d1a5170cdfbc547fba25b670d3.zip |
Fix NPE with multiblock explosion (#1565)
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 6df995258e..a8a8cde0b0 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -5,6 +5,7 @@ import static mcp.mobius.waila.api.SpecialChars.GREEN; import static mcp.mobius.waila.api.SpecialChars.RED; import static mcp.mobius.waila.api.SpecialChars.RESET; +import com.google.common.collect.Iterables; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; @@ -620,22 +621,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity GT_Pollution.addPollution(getBaseMetaTileEntity(), GT_Mod.gregtechproxy.mPollutionOnExplosion); mInventory[1] = null; - for (MetaTileEntity tTileEntity : mInputBusses) - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - for (MetaTileEntity tTileEntity : mOutputBusses) - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - for (MetaTileEntity tTileEntity : mInputHatches) - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - for (MetaTileEntity tTileEntity : mOutputHatches) - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - for (MetaTileEntity tTileEntity : mDynamoHatches) - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - for (MetaTileEntity tTileEntity : mMufflerHatches) - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - for (MetaTileEntity tTileEntity : mEnergyHatches) - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); - for (MetaTileEntity tTileEntity : mMaintenanceHatches) - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); + Iterable<MetaTileEntity> allHatches = Iterables.concat( + mInputBusses, + mOutputBusses, + mInputHatches, + mOutputHatches, + mDynamoHatches, + mMufflerHatches, + mEnergyHatches, + mMaintenanceHatches); + for (MetaTileEntity tTileEntity : allHatches) { + if (tTileEntity != null && tTileEntity.getBaseMetaTileEntity() != null) { + tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); + } + } getBaseMetaTileEntity().doExplosion(V[8]); } |