From 28f7fe4a2b8a5a0b043a391232f291131bf0d9dd Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 27 Dec 2016 11:43:56 +0100 Subject: [PATCH] made filter settings ignore the filter item --- .../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 72e010d06..635a604f0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java @@ -65,10 +65,7 @@ public class FilterSettings{ if(StackUtil.isValid(stack)){ for(int i = startSlot; i < endSlot; i++){ if(StackUtil.isValid(slots[i])){ - if(areEqualEnough(slots[i], stack, meta, nbt, mod, oredict)){ - return whitelist; - } - else if(slots[i].getItem() instanceof ItemFilter){ + if(slots[i].getItem() instanceof ItemFilter){ ItemStack[] filterSlots = new ItemStack[ContainerFilter.SLOT_AMOUNT]; ItemDrill.loadSlotsFromNBT(filterSlots, slots[i]); if(filterSlots != null && filterSlots.length > 0){ @@ -79,6 +76,9 @@ public class FilterSettings{ } } } + else if(areEqualEnough(slots[i], stack, meta, nbt, mod, oredict)){ + return whitelist; + } } } }