Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix /npc wolf collar parsing

This commit is contained in:
fullwall 2013-05-08 21:08:12 +08:00
parent 06360950dc
commit 83eb3c9721
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -1151,7 +1151,7 @@ public class NPCCommands {
@Command(
aliases = { "npc" },
usage = "wolf (-s(itting) a(ngry) t(amed)) --collar [rgb color]",
usage = "wolf (-s(itting) a(ngry) t(amed)) --collar [hex rgb color|name]",
desc = "Sets wolf modifiers",
modifiers = { "wolf" },
min = 1,
@ -1168,9 +1168,9 @@ public class NPCCommands {
String unparsed = args.getFlag("collar");
DyeColor color = null;
try {
DyeColor.valueOf(unparsed.toUpperCase().replace(' ', '_'));
color = DyeColor.valueOf(unparsed.toUpperCase().replace(' ', '_'));
} catch (IllegalArgumentException e) {
int rgb = Integer.parseInt(unparsed.replace("#", ""));
int rgb = Integer.parseInt(unparsed.replace("#", ""), 16);
color = DyeColor.getByColor(org.bukkit.Color.fromRGB(rgb));
}
if (color == null)