Fixed matching with blocks vs items

.gitignore

@@ -14,4 +14,4 @@
 
 /.gradle
 **/build
-
+out/

worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/BlockMatcher.java

@@ -0,0 +1,41 @@
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard.blacklist.target;
+
+import com.sk89q.worldedit.world.block.BlockType;
+
+public class BlockMatcher implements TargetMatcher {
+
+    private final BlockType type;
+
+    public BlockMatcher(BlockType type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getMatchedTypeId() {
+        return this.type.getId();
+    }
+
+    @Override
+    public boolean test(Target target) {
+        return target.getTypeId().equals(getMatchedTypeId());
+    }
+}

worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/BlockTarget.java

@@ -0,0 +1,41 @@
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard.blacklist.target;
+
+import com.sk89q.worldedit.world.block.BlockType;
+
+public class BlockTarget implements Target {
+
+    private BlockType type;
+
+    public BlockTarget(BlockType type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getTypeId() {
+        return type.getId();
+    }
+
+    @Override
+    public String getFriendlyName() {
+        return type.getName();
+    }
+}

worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java

@@ -22,6 +22,7 @@ package com.sk89q.worldguard.bukkit.internal;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldguard.blacklist.target.BlockTarget;
 import com.sk89q.worldguard.blacklist.target.ItemTarget;
 import com.sk89q.worldguard.blacklist.target.Target;
 import com.sk89q.worldguard.blacklist.target.TargetMatcher;
@@ -56,15 +57,19 @@ public class TargetMatcherSet {
     }
 
     public boolean test(Material material) {
+        if (material.isBlock()) {
+            return test(new BlockTarget(BukkitAdapter.asBlockType(material)));
+        } else {
             return test(new ItemTarget(BukkitAdapter.asItemType(material)));
         }
+    }
 
     public boolean test(Block block) {
-        return test(new ItemTarget(BukkitAdapter.asItemType(block.getType())));
+        return test(new BlockTarget(BukkitAdapter.asBlockType(block.getType())));
     }
 
     public boolean test(BlockState state) {
-        return test(new ItemTarget(BukkitAdapter.asItemType(state.getType())));
+        return test(new BlockTarget(BukkitAdapter.asBlockType(state.getType())));
     }
 
     public boolean test(ItemStack itemStack) {