From fc9893ac32e357817b851ac77092e43e5289bc4d Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Sat, 28 Jan 2023 15:48:14 +0800 Subject: [PATCH] fix npe from two storage bus facing each other --- .../github/inventory/external/AEFluidInterfaceHandler.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/external/AEFluidInterfaceHandler.java b/src/main/java/com/glodblock/github/inventory/external/AEFluidInterfaceHandler.java index 76dd9fc9..72e9d227 100644 --- a/src/main/java/com/glodblock/github/inventory/external/AEFluidInterfaceHandler.java +++ b/src/main/java/com/glodblock/github/inventory/external/AEFluidInterfaceHandler.java @@ -25,9 +25,11 @@ public class AEFluidInterfaceHandler implements IExternalStorageHandler { @SuppressWarnings("rawtypes") public IMEInventory getInventory(TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource src) { if (channel == StorageChannel.FLUIDS) { - if (te instanceof ITileStorageMonitorable) { + if (te instanceof ITileStorageMonitorable + && ((ITileStorageMonitorable) te).getMonitorable(d, src) != null) { return ((ITileStorageMonitorable) te).getMonitorable(d, src).getFluidInventory(); - } else if (Util.getPart(te, d.getOpposite()) instanceof ITileStorageMonitorable) { + } else if (Util.getPart(te, d.getOpposite()) instanceof ITileStorageMonitorable + && ((ITileStorageMonitorable) Util.getPart(te, d.getOpposite())).getMonitorable(d, src) != null) { ITileStorageMonitorable part = (ITileStorageMonitorable) Util.getPart(te, d.getOpposite()); return part.getMonitorable(d, src).getFluidInventory(); }