Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-03-12 22:59:04 +01:00
Code Issues Projects Releases Wiki Activity

Fix NavigationStuckEvent set-null

Browse Source 
If you set the action in a NavigationStuckEvent, it throws an NPE rather
than simply doing nothing. This patches that.
It also throws the event even when the default stuck action is null.
This commit is contained in:
mcmonkey4eva 2014-10-04 14:06:15 -07:00
parent 9eeae0c5b3
commit b5580ec70c
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();