Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-14 14:45:41 +01:00
Code Issues Projects Releases Wiki Activity

Disallow taking of NPC-given quests from other worlds, fixes #1119

Browse Source
This commit is contained in:
PikaMug 2020-03-14 20:17:49 -04:00
parent 51179e6f5a
commit 7c5b32dc0c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -3809,9 +3809,11 @@ public class Quester {
getPlayer().sendMessage(ChatColor.YELLOW + msg);
}
return false;
} else if (quest.getNpcStart() != null && quest.getNpcStart().getEntity() != null
&& quest.getNpcStart().getEntity().getLocation().distance(getPlayer().getLocation()) > 6.0
&& plugin.getSettings().canAllowCommandsForNpcQuests() == false) {
} else if (plugin.getSettings().canAllowCommandsForNpcQuests() == false
&& quest.getNpcStart() != null && quest.getNpcStart().getEntity() != null
&& quest.getNpcStart().getEntity().getLocation().getWorld().getName().equals(
getPlayer().getLocation().getWorld().getName())
&& quest.getNpcStart().getEntity().getLocation().distance(getPlayer().getLocation()) > 6.0) {
if (giveReason) {
String msg = Lang.get(getPlayer(), "mustSpeakTo");
msg = msg.replace("<npc>", ChatColor.DARK_PURPLE + quest.getNpcStart().getName() + ChatColor.YELLOW);