From fa93771e56f8b185006651ff7081f225dacdd219 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 26 Feb 2019 22:38:36 -0500 Subject: [PATCH] Avoid exception on /questadmin reload, fixes #714 --- main/src/main/java/me/blackvein/quests/Quest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main/src/main/java/me/blackvein/quests/Quest.java b/main/src/main/java/me/blackvein/quests/Quest.java index e74b15d37..a5f811727 100644 --- a/main/src/main/java/me/blackvein/quests/Quest.java +++ b/main/src/main/java/me/blackvein/quests/Quest.java @@ -313,6 +313,9 @@ public class Quest { if (!plugin.getSettings().canUseCompass()) { return false; } + if (quester == null) { + return false; + } if (nextStage == null) { return false; } @@ -327,7 +330,7 @@ public class Quest { NPC npc = plugin.getDependencies().getCitizens().getNPCRegistry().getById(nextStage.itemDeliveryTargets.getFirst()); targetLocation = npc.getStoredLocation(); } - if (targetLocation != null) { + if (targetLocation != null && targetLocation.getWorld() != null) { if (targetLocation.getWorld().getName().equals(quester.getPlayer().getWorld().getName())) { quester.getPlayer().setCompassTarget(targetLocation); }