From c8090b04f06eb27797daadf23d8a867f39d42cea Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 27 Jan 2015 19:26:35 -0500 Subject: [PATCH] Fix IItemDuct methods on item conduit ignoring filter settings --- .../java/crazypants/enderio/conduit/item/ItemConduit.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 9affd748..0d15d8da 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -35,6 +35,7 @@ import crazypants.enderio.tool.ToolUtil; import crazypants.render.IconUtil; import crazypants.util.BlockCoord; import crazypants.util.DyeColor; +import crazypants.util.ItemUtil; public class ItemConduit extends AbstractConduit implements IItemConduit { @@ -250,8 +251,13 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { return item; } else if(network == null) { return item; + } else { + IItemFilter filter = inputFilters.get(from); + ItemConduitNetwork network = (ItemConduitNetwork) getNetwork(); + if(filter != null && !filter.doesItemPassFilter(network.getInventory(this, from.getOpposite()), item)) { + return item; + } } - return network.sendItems(this, item, from); }