From 17c528755557259fdabccc49ffd40f4c28381fdb Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Fri, 15 Mar 2019 14:07:51 -0600 Subject: [PATCH] Fix #5110, #3718, #4226; Advanced bounding blocks were setting miner block to air if chunk wasn't loaded :/ --- .../tile/TileEntityAdvancedBoundingBlock.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index fc0a34421..be3961aba 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -8,6 +8,7 @@ import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.common.Mekanism; import mekanism.common.base.IAdvancedBoundingBlock; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.MekanismHooks; @@ -334,14 +335,19 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return null; } + // Return the inventory/main tile; note that it's possible, esp. when chunks are + // loading that the inventory/main tile has not yet loaded and thus is null. TileEntity tile = new Coord4D(mainPos, world).getTileEntity(world); - - if (!(tile instanceof IAdvancedBoundingBlock)) { - world.setBlockToAir(mainPos); - return null; + if (tile instanceof IAdvancedBoundingBlock) { + return (IAdvancedBoundingBlock) tile; + } else if (tile != null) { + // On the off chance that another block got placed there (which seems only likely with corruption, + // go ahead and log what we found. + Mekanism.logger.info("getInv() references a position that does not implement IAdvancedBoundingBlock: {}\n" + + "\tFound instead: {}\nPlease report this to the maintainer of Mekanica!", mainPos, tile); } - return (IAdvancedBoundingBlock) tile; + return null; } @Override