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

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

Browse Source
This commit is contained in:
fullwall 2014-10-08 01:12:48 +08:00
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(); stopNavigating();
return; return;
} }
if (reason == CancelReason.STUCK && localParams.stuckAction() != null) { if (reason == CancelReason.STUCK) {
StuckAction action = localParams.stuckAction(); StuckAction action = localParams.stuckAction();
NavigationStuckEvent event = new NavigationStuckEvent(this, action); NavigationStuckEvent event = new NavigationStuckEvent(this, action);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
action = event.getAction(); action = event.getAction();
boolean shouldContinue = action.run(npc, this); boolean shouldContinue = action != null ? action.run(npc, this): false;
if (shouldContinue) { if (shouldContinue) {
stationaryTicks = 0; stationaryTicks = 0;
executing.clearCancelReason(); executing.clearCancelReason();