Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-12-26 11:08:02 +01:00
Code Issues Projects Releases Wiki Activity

Prefer Material enum over ItemType lookup when parsing TargetMatchers.

Browse Source 
This will make Bukkit's names take priority when trying to identify a block or item,
since ItemType lookup will return, e.g. "birch_door_item" for "birch_door", even though
there's a block with the name "birch_door".

Note that using int ids is always preferable when possible since there's no confusion there.

Fixes WORLDGUARD-3790.
This commit is contained in:
wizjany 2017-01-12 14:11:57 -05:00
parent e019890f1d
commit 1c29e85f19
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java
View File

@ -53,16 +53,16 @@ private int parseType(String input) throws TargetMatcherParseException {
try { try {
return Integer.parseInt(input); return Integer.parseInt(input);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
int id = getItemID(input);
if (id > 0) {
return id;
}
Material material = Enums.findFuzzyByValue(Material.class, input); Material material = Enums.findFuzzyByValue(Material.class, input);
if (material != null) { if (material != null) {
return material.getId(); return material.getId();
} }
int id = getItemID(input);
if (id > 0) {
return id;
}
throw new TargetMatcherParseException("Unknown block or item name: " + input); throw new TargetMatcherParseException("Unknown block or item name: " + input);
} }
} }