From 2d0370a55e80aeb64cbd82c916aa13f648ba2ce6 Mon Sep 17 00:00:00 2001 From: mcmonkey Date: Sat, 9 Mar 2019 10:36:48 -0800 Subject: [PATCH] patch NPE in followTrait#toggle --- main/src/main/java/net/citizensnpcs/trait/FollowTrait.java | 1 + 1 file changed, 1 insertion(+) diff --git a/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java b/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java index 4468d7e15..462091c30 100644 --- a/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java @@ -62,6 +62,7 @@ public boolean toggle(OfflinePlayer player, boolean protect) { } this.followingUUID = player.getUniqueId(); if (npc.getNavigator().isNavigating() && this.player != null + && npc.getNavigator().getEntityTarget() != null && this.player == npc.getNavigator().getEntityTarget().getTarget()) { npc.getNavigator().cancelNavigation(); }