From 7065a95b35672894b059677c8aeaa22ab9733d26 Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <mcmonkey4eva@hotmail.com>
Date: Mon, 23 Mar 2015 19:49:42 -0700
Subject: [PATCH 1/2] Fix guided waypoint markers by blocking the t_ method
 which allows movement in the NMS

---
 .../citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java b/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java
index 64935c6d9..0802c572a 100644
--- a/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java
@@ -21,4 +21,8 @@ public class EntityEnderSignalMarker extends EntityEnderSignal {
     @Override
     public void h() {
     }
+
+    @Override
+    public void t_() {
+    }
 }

From 6d4cf835b233c63ab62f15b35e6d6e2a84172e5a Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <mcmonkey4eva@hotmail.com>
Date: Mon, 23 Mar 2015 20:08:37 -0700
Subject: [PATCH 2/2] Fix the sheep command somewhat..  it works at least,
 doesnt have reasonable messages though

---
 src/main/java/net/citizensnpcs/commands/NPCCommands.java | 8 +++++++-
 src/main/java/net/citizensnpcs/trait/SheepTrait.java     | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index e2120f26f..7e92ad9e8 100644
--- a/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -1200,10 +1200,12 @@ public class NPCCommands {
             max = 1,
             permission = "citizens.npc.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);
+        boolean hasArg = false;
         if (args.hasValueFlag("sheared")) {
             trait.setSheared(Boolean.valueOf(args.getFlag("sheared")));
+            hasArg = true;
         }
         if (args.hasValueFlag("color")) {
             DyeColor color = Util.matchEnum(DyeColor.values(), args.getFlag("color"));
@@ -1213,6 +1215,10 @@ public class NPCCommands {
             } else {
                 Messaging.sendErrorTr(sender, Messages.INVALID_SHEEP_COLOR, Util.listValuesPretty(DyeColor.values()));
             }
+            hasArg = true;
+        }
+        if (!hasArg) {
+            throw new CommandException();
         }
     }
 
diff --git a/src/main/java/net/citizensnpcs/trait/SheepTrait.java b/src/main/java/net/citizensnpcs/trait/SheepTrait.java
index 20173d9a8..b6cee3a67 100644
--- a/src/main/java/net/citizensnpcs/trait/SheepTrait.java
+++ b/src/main/java/net/citizensnpcs/trait/SheepTrait.java
@@ -11,9 +11,9 @@ import org.bukkit.event.player.PlayerShearEntityEvent;
 
 public class SheepTrait extends Trait {
     @Persist("color")
-    private DyeColor color;
+    private DyeColor color = DyeColor.WHITE;
     @Persist("sheared")
-    private boolean sheared;
+    private boolean sheared = false;
 
     public SheepTrait() {
         super("sheeptrait");