Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 20:55:44 +01:00
Code Issues Projects Releases Wiki Activity

( Patch for #1453 ) proper wolf command output

Browse Source 
"i" flag is left in as a way to get info output but not actually checked (as info output should also appear if changes are made)
This commit is contained in:
mcmonkey4eva 2018-03-23 04:34:51 -07:00
parent acb50f6a50
commit ec8a16c30b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1971,7 +1971,7 @@ public class NPCCommands {
min = 1, min = 1,
max = 1, max = 1,
requiresFlags = true, requiresFlags = true,
flags = "sat", flags = "sati",
permission = "citizens.npc.wolf") permission = "citizens.npc.wolf")
@Requirements(selected = true, ownership = true, types = EntityType.WOLF) @Requirements(selected = true, ownership = true, types = EntityType.WOLF)
public void wolf(CommandContext args, CommandSender sender, NPC npc) throws CommandException { public void wolf(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
@ -2002,9 +2002,7 @@ public class NPCCommands {
throw new CommandException(Messages.COLLAR_COLOUR_NOT_SUPPORTED, unparsed); throw new CommandException(Messages.COLLAR_COLOUR_NOT_SUPPORTED, unparsed);
trait.setCollarColor(color); trait.setCollarColor(color);
} }
if (args.hasFlag('i')) { Messaging.sendTr(sender, Messages.WOLF_TRAIT_UPDATED, npc.getName(), trait.isAngry(), trait.isSitting(),
Messaging.sendTr(sender, Messages.WOLF_TRAIT_UPDATED, npc.getName(), args.hasFlag('a'), args.hasFlag('s'), trait.isTamed(), trait.getCollarColor().name());
args.hasFlag('t'), trait.getCollarColor().name());
}
} }
} }