Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:CitizensDev/Citizens2

This commit is contained in:
fullwall 2014-10-08 01:12:48 +08:00
parent 7c441bdefd 3e2fd8516c
commit ec2eae62b7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
View File

@ -225,12 +225,12 @@ public class CitizensNavigator implements Navigator, Runnable {
stopNavigating();
return;
}
if (reason == CancelReason.STUCK && localParams.stuckAction() != null) {
if (reason == CancelReason.STUCK) {
StuckAction action = localParams.stuckAction();
NavigationStuckEvent event = new NavigationStuckEvent(this, action);
Bukkit.getPluginManager().callEvent(event);
action = event.getAction();
boolean shouldContinue = action.run(npc, this);
boolean shouldContinue = action != null ? action.run(npc, this): false;
if (shouldContinue) {
stationaryTicks = 0;
executing.clearCancelReason();