Fix NPC targeting

CitizensDev · Dec 21, 2014 · 866a381 · 866a381
1 parent 64935ef
commit 866a381
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -268,7 +268,7 @@ public void copy(CommandContext args, CommandSender sender, NPC npc) throws Comm
         }
 
         CommandSenderCreateNPCEvent event = sender instanceof Player ? new PlayerCreateNPCEvent((Player) sender, copy)
-        : new CommandSenderCreateNPCEvent(sender, copy);
+                : new CommandSenderCreateNPCEvent(sender, copy);
         Bukkit.getPluginManager().callEvent(event);
         if (event.isCancelled()) {
             event.getNPC().destroy();
@@ -344,7 +344,7 @@ public void create(CommandContext args, CommandSender sender, NPC npc) throws Co
             spawnLoc = args.getSenderLocation();
         }
         CommandSenderCreateNPCEvent event = sender instanceof Player ? new PlayerCreateNPCEvent((Player) sender, npc)
-        : new CommandSenderCreateNPCEvent(sender, npc);
+                : new CommandSenderCreateNPCEvent(sender, npc);
         Bukkit.getPluginManager().callEvent(event);
         if (event.isCancelled()) {
             npc.destroy();
@@ -842,6 +842,8 @@ public void npc(CommandContext args, CommandSender sender, NPC npc) {
             String message = "     <e>- <a>" + trait.getName();
             Messaging.send(sender, message);
         }
+
+        npc.getNavigator().setTarget((Entity) sender, true);
     }
 
     @Command(
@@ -1021,7 +1023,7 @@ public void pose(CommandContext args, CommandSender sender, NPC npc) throws Comm
     @Requirements(selected = true, ownership = true, types = { EntityType.CREEPER })
     public void power(CommandContext args, CommandSender sender, NPC npc) {
         Messaging
-        .sendTr(sender, npc.getTrait(Powered.class).toggle() ? Messages.POWERED_SET : Messages.POWERED_STOPPED);
+                .sendTr(sender, npc.getTrait(Powered.class).toggle() ? Messages.POWERED_SET : Messages.POWERED_STOPPED);
     }
 
     @Command(
@@ -1044,7 +1046,7 @@ public void profession(CommandContext args, CommandSender sender, NPC npc) throw
     }
 
     @Command(aliases = { "npc" }, usage = "remove|rem (all|id|name)", desc = "Remove a NPC", modifiers = { "remove",
-    "rem" }, min = 1, max = 2)
+            "rem" }, min = 1, max = 2)
     @Requirements
     public void remove(final CommandContext args, final CommandSender sender, NPC npc) throws CommandException {
         if (args.argsLength() == 2) {

diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
@@ -177,7 +177,7 @@ private NavigationFieldWrapper(NavigationAbstract navigation) {
 
         @Override
         public void setPath() {
-            navigation.a(target, parameters.speed());
+            navigation.a(target, 1f);
         }
 
         @Override

diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -79,7 +79,8 @@ public static void addOrRemoveFromPlayerList(org.bukkit.entity.Entity entity, bo
     }
 
     public static void attack(EntityLiving handle, Entity target) {
-        float f = (float) handle.getAttributeInstance(GenericAttributes.e).getValue();
+        AttributeInstance attackDamage = handle.getAttributeInstance(GenericAttributes.e);
+        float f = (float) (attackDamage == null ? 1 : attackDamage.getValue());
         int i = 0;
 
         if (target instanceof EntityLiving) {