Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-04 01:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #246 from JCThePants/JCThePants-patch-1

Browse Source 
Fix NPC sometimes spins in circles...
This commit is contained in:
fullwall 2015-02-20 19:40:43 +08:00
commit 9cd19d8509
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java
View File

@ -15,12 +15,13 @@ public class MCNavigationStrategy extends AbstractPathStrategy {
private final NavigationAbstract navigation; private final NavigationAbstract navigation;
private final NavigatorParameters parameters; private final NavigatorParameters parameters;
private final Location target; private final Location target;
private final EntityLiving handle;
MCNavigationStrategy(final NPC npc, Location dest, NavigatorParameters params) { MCNavigationStrategy(final NPC npc, Location dest, NavigatorParameters params) {
super(TargetType.LOCATION); super(TargetType.LOCATION);
this.target = dest; this.target = dest;
this.parameters = params; this.parameters = params;
EntityLiving handle = ((CraftLivingEntity) npc.getEntity()).getHandle(); handle = ((CraftLivingEntity) npc.getEntity()).getHandle();
handle.onGround = true; handle.onGround = true;
// not sure of a better way around this - if onGround is false, then // not sure of a better way around this - if onGround is false, then
// navigation won't execute, and calling entity.move doesn't // navigation won't execute, and calling entity.move doesn't
@ -58,6 +59,17 @@ public class MCNavigationStrategy extends AbstractPathStrategy {
return true; return true;
navigation.a(parameters.speed()); navigation.a(parameters.speed());
parameters.run(); parameters.run();
if (distanceSquared() < parameters.distanceMargin()) {
stop();
return true;
}
return NMS.isNavigationFinished(navigation); return NMS.isNavigationFinished(navigation);
} }
private double distanceSquared() {
return handle.getBukkitEntity().getLocation(HANDLE_LOCATION)
.distanceSquared(target);
}
private static final Location HANDLE_LOCATION = new Location(null, 0, 0, 0);
} }