Merge pull request #294 from mcmonkey4eva/EntityPatch

Fix guided waypoint markers by blocking the t_ method which allows movement in the NMS

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();
         }
     }
 

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");

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_() {
+    }
 }