From e288bd934c725f2e98e705e4169ba661b29ff4a2 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Wed, 15 Apr 2020 04:20:21 +0800
Subject: [PATCH] Fix NPE in linear waypoint editor

---
 .../net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
index e1d3502a6..396da96a0 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
@@ -360,7 +360,7 @@ private void onWaypointsModified() {
             if (currentGoal != null) {
                 currentGoal.onProviderChanged();
             }
-            if (conversation != null) {
+            if (conversation != null && getCurrentWaypoint() != null) {
                 getCurrentWaypoint().describeTriggers(player);
             }
         }