From a9620187e7fc48e4aafcfc80389773831287ee18 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Mon, 17 Feb 2020 21:59:13 -0500 Subject: [PATCH] Correct distance check when taking NPC quest, fixes #1081 --- main/src/main/java/me/blackvein/quests/Quester.java | 2 +- .../main/java/me/blackvein/quests/listeners/NpcListener.java | 2 +- .../main/java/me/blackvein/quests/listeners/PlayerListener.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index f3493d33b..e623a3a9d 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -3739,7 +3739,7 @@ public class Quester { } return false; } else if (quest.getNpcStart() != null && quest.getNpcStart().getEntity() != null - && quest.getNpcStart().getEntity().getLocation().distance(getPlayer().getLocation()) < 5.0 + && quest.getNpcStart().getEntity().getLocation().distance(getPlayer().getLocation()) > 6.0 && plugin.getSettings().canAllowCommandsForNpcQuests() == false) { if (giveReason) { String msg = Lang.get(getPlayer(), "mustSpeakTo"); diff --git a/main/src/main/java/me/blackvein/quests/listeners/NpcListener.java b/main/src/main/java/me/blackvein/quests/listeners/NpcListener.java index 22c00decb..c57118dfe 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/NpcListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/NpcListener.java @@ -47,7 +47,7 @@ import net.citizensnpcs.api.npc.NPC; public class NpcListener implements Listener { - final Quests plugin; + private final Quests plugin; public NpcListener(Quests newPlugin) { plugin = newPlugin; diff --git a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java index 39f338bd8..ea06b45f8 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java @@ -80,7 +80,7 @@ import net.citizensnpcs.api.CitizensAPI; public class PlayerListener implements Listener { - final Quests plugin; + private final Quests plugin; public PlayerListener(Quests newPlugin) { plugin = newPlugin;