From 30f10d5b91508b8176d32220e425028557af7bb3 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 23 Dec 2016 15:13:57 +0100 Subject: [PATCH] Made filter items not be respected as a whitelisted item Closes #512 --- .../actuallyadditions/mod/tile/FilterSettings.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java index aadaf4e4b..ed72580f8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java @@ -63,10 +63,7 @@ public class FilterSettings{ ItemStack slot = filter.getStackInSlot(i); if(StackUtil.isValid(slot)){ - if(areEqualEnough(slot, stack, meta, nbt, mod, oredict)){ - return whitelist; - } - else if(SlotFilter.isFilter(slot)){ + if(SlotFilter.isFilter(slot)){ ItemStackHandlerCustom inv = new ItemStackHandlerCustom(ContainerFilter.SLOT_AMOUNT); ItemDrill.loadSlotsFromNBT(inv, slot); for(int k = 0; k < inv.getSlots(); k++){ @@ -76,6 +73,9 @@ public class FilterSettings{ } } } + else if(areEqualEnough(slot, stack, meta, nbt, mod, oredict)){ + return whitelist; + } } } }