From 2f0c1949c2558bff8473ade207565f2bfefd632d Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Tue, 25 Aug 2015 21:52:10 +0800
Subject: [PATCH] Fixes

---
 .../citizensnpcs/commands/TraitCommands.java   | 18 +++++++++---------
 .../java/net/citizensnpcs/npc/CitizensNPC.java |  2 +-
 .../citizensnpcs/npc/ai/MCTargetStrategy.java  | 11 ++++++-----
 .../npc/entity/HumanController.java            |  3 +--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/commands/TraitCommands.java b/src/main/java/net/citizensnpcs/commands/TraitCommands.java
index 7de240746..a328c5511 100644
--- a/src/main/java/net/citizensnpcs/commands/TraitCommands.java
+++ b/src/main/java/net/citizensnpcs/commands/TraitCommands.java
@@ -2,6 +2,13 @@ package net.citizensnpcs.commands;
 
 import java.util.List;
 
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.command.Command;
 import net.citizensnpcs.api.command.CommandConfigurable;
@@ -16,13 +23,6 @@ import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
 import net.citizensnpcs.util.StringHelper;
 
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-
 @Requirements(selected = true, ownership = true)
 public class TraitCommands {
     @Command(
@@ -30,12 +30,12 @@ public class TraitCommands {
             usage = "add [trait name]...",
             desc = "Adds traits to the NPC",
             modifiers = { "add", "a" },
-            min = 1,
+            min = 2,
             permission = "citizens.npc.trait")
     public void add(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
         List<String> added = Lists.newArrayList();
         List<String> failed = Lists.newArrayList();
-        for (String traitName : Splitter.on(',').split(args.getJoinedStrings(0))) {
+        for (String traitName : Splitter.on(',').split(args.getJoinedStrings(1))) {
             if (!sender.hasPermission("citizens.npc.trait." + traitName)
                     && !sender.hasPermission("citizens.npc.trait.*")) {
                 failed.add(String.format("%s: No permission", traitName));
diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index b83088520..d8147918f 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -291,7 +291,7 @@ public class CitizensNPC extends AbstractNPC {
                     && getEntity().getWorld().getFullTime() % Setting.PACKET_UPDATE_DELAY.asInt() == 0) {
                 if (getEntity() instanceof LivingEntity) {
                     if (!getEntity().isCustomNameVisible()) {
-                        getEntity().setCustomName("");
+                        getEntity().setCustomName("&2");
                     } else {
                         getEntity().setCustomName(getFullName());
                     }
diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
index c79813373..c7d91628c 100644
--- a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
+++ b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
@@ -1,5 +1,9 @@
 package net.citizensnpcs.npc.ai;
 
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.entity.LivingEntity;
+
 import net.citizensnpcs.api.ai.AttackStrategy;
 import net.citizensnpcs.api.ai.EntityTarget;
 import net.citizensnpcs.api.ai.NavigatorParameters;
@@ -13,10 +17,6 @@ import net.minecraft.server.v1_8_R3.EntityLiving;
 import net.minecraft.server.v1_8_R3.EntityPlayer;
 import net.minecraft.server.v1_8_R3.NavigationAbstract;
 
-import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
-import org.bukkit.entity.LivingEntity;
-
 public class MCTargetStrategy implements PathStrategy, EntityTarget {
     private final boolean aggro;
     private int attackTicks;
@@ -117,9 +117,10 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
         }
         if (!aggro && distanceSquared() < parameters.distanceMargin()) {
             stop();
-        } else if (target.world.getWorld().getFullTime() % 10 == 0) {
+        } else if (target.world.getWorld().getFullTime() % 40 == 0) {
             setPath();
         }
+
         NMS.look(handle, target);
         if (aggro && canAttack()) {
             AttackStrategy strategy = parameters.attackStrategy();
diff --git a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
index 046fe92bf..f977bdcdc 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
@@ -100,7 +100,6 @@ public class HumanController extends AbstractEntityController {
             msb |= 0x0000000000002000L;
             uuid = new UUID(msb, uuid.getLeastSignificantBits());
         }
-
         GameProfile profile = new GameProfile(uuid, coloredName);
         updateSkin(npc, nmsWorld, profile);
 
@@ -118,7 +117,7 @@ public class HumanController extends AbstractEntityController {
 
                 if (prefixCapture != null) {
                     Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard();
-                    String teamName = UUID.randomUUID().toString().substring(0,16);
+                    String teamName = UUID.randomUUID().toString().substring(0, 16);
 
                     Team team = scoreboard.getTeam(teamName);
                     if (team == null) {