From b0fad5db166a9950f2d8b62b6eeff60dc0915db3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 12 May 2016 17:51:58 -0500 Subject: [PATCH] Fix hopperhock being broken with vanilla chests --- .../common/core/helper/InventoryHelper.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 9e0378252..0a52697b0 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -107,14 +107,19 @@ public class InventoryHelper { if(te == null) return null; - IItemHandler ret = te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? - te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; - if(te instanceof TileEntityChest) - ret = VanillaDoubleChestItemHandler.get(((TileEntityChest) te)); + + if(te instanceof TileEntityChest) { + IItemHandler doubleChest = VanillaDoubleChestItemHandler.get(((TileEntityChest) te)); + if(doubleChest != VanillaDoubleChestItemHandler.NO_ADJACENT_CHESTS_INSTANCE) + return doubleChest; + } + + IItemHandler ret = te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? + te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; + if(ret == null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) ret = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); - return ret; }