diff --git a/src/main/java/mekanism/common/InventoryNetwork.java b/src/main/java/mekanism/common/InventoryNetwork.java index 4b71ecbe0..3f3e49395 100644 --- a/src/main/java/mekanism/common/InventoryNetwork.java +++ b/src/main/java/mekanism/common/InventoryNetwork.java @@ -59,6 +59,11 @@ public class InventoryNetwork extends DynamicNetwork sides = acceptorDirections.get(coord); IInventory acceptor = (IInventory)coord.getTileEntity(getWorld()); diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index fe58d1564..3b45e9655 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -79,13 +79,13 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl @Override public int getSizeInventory() { - return inventory.length; + return inventory != null ? inventory.length : 0; } @Override public ItemStack getStackInSlot(int slotID) { - return inventory[slotID]; + return inventory != null ? inventory[slotID] : null; } @Override