diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index a239d6435..bd1533a63 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -64,7 +64,9 @@ public abstract class DynamicNetwork> implemen return; } - if(acceptor.getTileEntity(getWorld()) == null || acceptor.getTileEntity(getWorld()).isInvalid() || transmitter.canConnectToAcceptor(side, true)) + World world = getWorld(); + + if(acceptor.getTileEntity(world) == null || acceptor.getTileEntity(world).isInvalid() || transmitter.canConnectToAcceptor(side, true)) { acceptorDirections.get(acceptor).remove(side.getOpposite()); diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 36f2a6b84..38cc258ea 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -470,6 +470,11 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I stacks: for(ItemStack stack : stacks) { + if(stack == null) + { + continue; + } + for(int i = 0; i < 27; i++) { if(testInv[i] == null)