diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java index f7cd3fa4..04379cba 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java @@ -182,22 +182,28 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost @Override public IItemList getAvailableItems(IItemList out, int iteration) { - if (itemCache == null) { - itemCache = AEApi.instance().storage().createItemList(); + if (this.itemCache == null) { IMEMonitor fluidGrid = getFluidGrid(); if (fluidGrid != null) { - for (IAEFluidStack fluid : fluidGrid.getStorageList()) { + final IItemList fluidStorage = fluidGrid.getStorageList(); + this.itemCache = AEApi.instance().storage().createItemList(); + + for (IAEFluidStack fluid : fluidStorage) { IAEItemStack stack = ItemFluidDrop.newAeStack(fluid); if (stack != null && !FluidCraftAPI.instance().isBlacklistedInDisplay(fluid.getFluid().getClass())) { - itemCache.add(stack); + this.itemCache.add(stack); } } } } - for (IAEItemStack stack : itemCache) { - out.addStorage(stack); + + if (this.itemCache != null) { + for (IAEItemStack stack : this.itemCache) { + out.addStorage(stack); + } } + return out; }