From 542a2e5d5a9f12034ec5436424efaca35357e33a Mon Sep 17 00:00:00 2001 From: yueh Date: Fri, 11 Aug 2017 21:33:57 +0200 Subject: [PATCH] Fixes NPE due to using wrong field. --- src/main/java/appeng/parts/misc/PartStorageBus.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index 50e99946f..dd1815705 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -409,16 +409,21 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC { return 0; } + final EnumFacing targetSide = this.getSide().getFacing().getOpposite(); + if( target.hasCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, targetSide ) ) { return 0; } + final IItemHandler itemHandler = target.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide ); - if( handler != null ) + + if( itemHandler != null ) { return Objects.hash( target, itemHandler, itemHandler.getSlots() ); } + return 0; }