Merge pull request #147 from mcmonkey4eva/master

Fix teleport bugging

src/main/java/net/citizensnpcs/EventListen.java

@@ -408,10 +408,8 @@ public class EventListen implements Listener {
     }
 
     private Location roundLocation(Location input) {
-        input.setX(input.getBlockX());
-        input.setY(input.getBlockY());
-        input.setZ(input.getBlockZ());
-        return input;
+        return new Location(input.getWorld(), Math.floor(input.getX()),
+                Math.floor(input.getY()), Math.floor(input.getZ()));
     }
 
     private boolean spawn(NPC npc) {

src/main/java/net/citizensnpcs/npc/entity/HumanController.java

@@ -93,7 +93,7 @@ public class HumanController extends AbstractEntityController {
                     NMS.sendPlayerlistPacket(false, null, npc);
                 }
             }
-        }, 60);
+        }, 2);
         return handle.getBukkitEntity();
     }
 

src/main/java/net/citizensnpcs/util/NMS.java

@@ -512,7 +512,7 @@ public class NMS {
                     sendPlayerlistPacket(false, player, npc);
                 }
             }
-        }, 61);
+        }, 2);
     }
 
     public static org.bukkit.entity.Entity spawnCustomEntity(org.bukkit.World world, Location at,