From 1af1ad15782a9e66bf7ec679e3501eea112abb4f Mon Sep 17 00:00:00 2001 From: cp Date: Fri, 28 Mar 2014 15:39:51 +0800 Subject: [PATCH] Fixed failed merge. --- .../java/crazypants/enderio/conduit/item/ItemConduit.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 60e60337..f225715f 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -9,6 +9,7 @@ import java.util.Map.Entry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -379,10 +380,10 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { @Override public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { IInventory inv = getExternalInventory(direction); - if (inv instanceof ISidedInventory) { - return ((ISidedInventory)inv).getAccessibleSlotsFromSide(direction.getOpposite().ordinal()).length != 0; + if(inv instanceof ISidedInventory) { + return ((ISidedInventory) inv).getAccessibleSlotsFromSide(direction.getOpposite().ordinal()).length != 0; } else { - return inv != null; + return inv != null; } }