Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-23 00:21:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:CitizensDev/Citizens2

Browse Source
This commit is contained in:
fullwall 2018-03-26 12:06:38 +08:00
commit 33568b24c2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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