Skip to content

Commit

Permalink
If there are no filters, don't require them to pass.
Browse files Browse the repository at this point in the history
  • Loading branch information
me4502 committed Dec 21, 2016
1 parent 71378d7 commit 035453d
Showing 1 changed file with 14 additions and 16 deletions.
Original file line number Original file line Diff line number Diff line change
@@ -1,20 +1,5 @@
package com.sk89q.craftbook.mechanics.ic.gates.world.items; package com.sk89q.craftbook.mechanics.ic.gates.world.items;


import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Item;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;

import com.sk89q.craftbook.ChangedSign; import com.sk89q.craftbook.ChangedSign;
import com.sk89q.craftbook.bukkit.util.BukkitUtil; import com.sk89q.craftbook.bukkit.util.BukkitUtil;
import com.sk89q.craftbook.mechanics.ic.AbstractICFactory; import com.sk89q.craftbook.mechanics.ic.AbstractICFactory;
Expand All @@ -31,6 +16,19 @@
import com.sk89q.craftbook.util.RegexUtil; import com.sk89q.craftbook.util.RegexUtil;
import com.sk89q.craftbook.util.SignUtil; import com.sk89q.craftbook.util.SignUtil;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Item;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;


public class RangedCollector extends AbstractSelfTriggeredIC { public class RangedCollector extends AbstractSelfTriggeredIC {


Expand Down Expand Up @@ -111,7 +109,7 @@ public boolean collect() {
if(!ItemUtil.isStackValid(stack)) if(!ItemUtil.isStackValid(stack))
return false; return false;


boolean passed = !include; boolean passed = filters.isEmpty() || !include;


for(ItemStack filter : filters) { for(ItemStack filter : filters) {
if(!ItemUtil.isStackValid(filter)) if(!ItemUtil.isStackValid(filter))
Expand Down

0 comments on commit 035453d

Please sign in to comment.