Made filter items not be respected as a whitelisted item

Closes #512
This commit is contained in:
Ellpeck 2016-12-23 15:13:57 +01:00
parent dc96af3343
commit 30f10d5b91

View file

@ -63,10 +63,7 @@ public class FilterSettings{
ItemStack slot = filter.getStackInSlot(i); ItemStack slot = filter.getStackInSlot(i);
if(StackUtil.isValid(slot)){ if(StackUtil.isValid(slot)){
if(areEqualEnough(slot, stack, meta, nbt, mod, oredict)){ if(SlotFilter.isFilter(slot)){
return whitelist;
}
else if(SlotFilter.isFilter(slot)){
ItemStackHandlerCustom inv = new ItemStackHandlerCustom(ContainerFilter.SLOT_AMOUNT); ItemStackHandlerCustom inv = new ItemStackHandlerCustom(ContainerFilter.SLOT_AMOUNT);
ItemDrill.loadSlotsFromNBT(inv, slot); ItemDrill.loadSlotsFromNBT(inv, slot);
for(int k = 0; k < inv.getSlots(); k++){ 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;
}
} }
} }
} }