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

Make LinearWaypointProvider more null safe

Browse Source
This commit is contained in:
fullwall 2019-12-21 20:25:38 +09:00
parent 3186f6de5e
commit 5972e3dffc
1 changed files with 408 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
View File

@ -103,7 +103,7 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
@Override @Override
public boolean isPaused() { public boolean isPaused() {
return currentGoal.isPaused(); return currentGoal == null ? false : currentGoal.isPaused();
} }
@Override @Override
@ -118,7 +118,10 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
@Override @Override
public void onRemove() { public void onRemove() {
if (currentGoal != null) {
npc.getDefaultGoalController().removeGoal(currentGoal); npc.getDefaultGoalController().removeGoal(currentGoal);
currentGoal = null;
}
} }
@Override @Override