Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-30 14:43:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix the sheep command somewhat.. it works at least, doesnt have reasonable messages though

Browse Source
This commit is contained in:
mcmonkey4eva 2015-03-23 20:08:37 -07:00
parent 7065a95b35
commit 6d4cf835b2
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1200,10 +1200,12 @@ public class NPCCommands {
max = 1, max = 1,
permission = "citizens.npc.sheep") permission = "citizens.npc.sheep")
@Requirements(selected = true, ownership = true, types = { EntityType.SHEEP }) @Requirements(selected = true, ownership = true, types = { EntityType.SHEEP })
public void sheep(CommandContext args, CommandSender sender, NPC npc) { public void sheep(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
SheepTrait trait = npc.getTrait(SheepTrait.class); SheepTrait trait = npc.getTrait(SheepTrait.class);
boolean hasArg = false;
if (args.hasValueFlag("sheared")) { if (args.hasValueFlag("sheared")) {
trait.setSheared(Boolean.valueOf(args.getFlag("sheared"))); trait.setSheared(Boolean.valueOf(args.getFlag("sheared")));
hasArg = true;
} }
if (args.hasValueFlag("color")) { if (args.hasValueFlag("color")) {
DyeColor color = Util.matchEnum(DyeColor.values(), args.getFlag("color")); DyeColor color = Util.matchEnum(DyeColor.values(), args.getFlag("color"));
@ -1213,6 +1215,10 @@ public class NPCCommands {
} else { } else {
Messaging.sendErrorTr(sender, Messages.INVALID_SHEEP_COLOR, Util.listValuesPretty(DyeColor.values())); Messaging.sendErrorTr(sender, Messages.INVALID_SHEEP_COLOR, Util.listValuesPretty(DyeColor.values()));
} }
hasArg = true;
}
if (!hasArg) {
throw new CommandException();
} }
} }

4
src/main/java/net/citizensnpcs/trait/SheepTrait.java
View File

@ -11,9 +11,9 @@ import org.bukkit.event.player.PlayerShearEntityEvent;
public class SheepTrait extends Trait { public class SheepTrait extends Trait {
@Persist("color") @Persist("color")
private DyeColor color; private DyeColor color = DyeColor.WHITE;
@Persist("sheared") @Persist("sheared")
private boolean sheared; private boolean sheared = false;
public SheepTrait() { public SheepTrait() {
super("sheeptrait"); super("sheeptrait");