From 6e8e59aee533343372727d376014cc10503abcf3 Mon Sep 17 00:00:00 2001 From: sk89q Date: Fri, 29 Aug 2014 12:38:27 -0700 Subject: [PATCH] Check Material in TargetMatcherParser. --- .../blacklist/target/TargetMatcherParser.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java b/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java index deba9b7a..7e0665ee 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java @@ -23,6 +23,8 @@ import com.google.common.base.Predicates; import com.google.common.collect.Ranges; import com.sk89q.worldedit.blocks.ItemType; +import com.sk89q.worldguard.util.Enums; +import org.bukkit.Material; import java.util.ArrayList; import java.util.List; @@ -52,10 +54,16 @@ private int parseType(String input) throws TargetMatcherParseException { return Integer.parseInt(input); } catch (NumberFormatException e) { int id = getItemID(input); - if (id == 0) { - throw new TargetMatcherParseException("Unknown block or item name: " + input); + if (id != 0) { + return id; } - return id; + + Material material = Enums.findFuzzyByValue(Material.class, input); + if (material != null) { + return material.getId(); + } + + throw new TargetMatcherParseException("Unknown block or item name: " + input); } }