diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 25aa1171b..891719078 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -70,12 +70,15 @@ 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)) { possibleAcceptors.remove(acceptor); - if(acceptor.getTileEntity(getWorld()) != null) + + if(acceptor.getTileEntity(world) != null) { - acceptorDirections.remove(acceptor.getTileEntity(getWorld())); + acceptorDirections.remove(acceptor.getTileEntity(world)); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index ed2937ff1..021901b92 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -404,6 +404,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)