Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 16:58:34 +01:00
Code Issues Projects Releases Wiki Activity

made filter settings ignore the filter item

Browse source
This commit is contained in:
Ellpeck 2016-12-27 11:43:56 +01:00
parent f0713b56ec
commit 28f7fe4a2b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java
View file

@ -65,10 +65,7 @@ public class FilterSettings{
if(StackUtil.isValid(stack)){ if(StackUtil.isValid(stack)){
for(int i = startSlot; i < endSlot; i++){ for(int i = startSlot; i < endSlot; i++){
if(StackUtil.isValid(slots[i])){ if(StackUtil.isValid(slots[i])){
if(areEqualEnough(slots[i], stack, meta, nbt, mod, oredict)){ if(slots[i].getItem() instanceof ItemFilter){
return whitelist;
}
else if(slots[i].getItem() instanceof ItemFilter){
ItemStack[] filterSlots = new ItemStack[ContainerFilter.SLOT_AMOUNT]; ItemStack[] filterSlots = new ItemStack[ContainerFilter.SLOT_AMOUNT];
ItemDrill.loadSlotsFromNBT(filterSlots, slots[i]); ItemDrill.loadSlotsFromNBT(filterSlots, slots[i]);
if(filterSlots != null && filterSlots.length > 0){ 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;
}
} }
} }
} }