Ensure Citizens is enabled when considering quest offer, maybe fix #1134

This commit is contained in:
PikaMug 2020-03-25 16:07:29 -04:00
parent fcb1900e57
commit d706a06e69
2 changed files with 4 additions and 1 deletions

View File

@ -93,6 +93,8 @@ public class Dependencies {
if (isPluginAvailable("Citizens")) {
try {
citizens = (CitizensPlugin) plugin.getServer().getPluginManager().getPlugin("Citizens");
plugin.getLogger().info("Sucessfully linked Quests with Citizens "
+ citizens.getDescription().getVersion());
} catch (Exception e) {
plugin.getLogger().warning("Legacy version of Citizens found. Citizens in Quests not enabled.");
}

View File

@ -3809,7 +3809,8 @@ public class Quester {
getPlayer().sendMessage(ChatColor.YELLOW + msg);
}
return false;
} else if (plugin.getSettings().canAllowCommandsForNpcQuests() == false
} else if (plugin.getDependencies().getCitizens() != null
&& plugin.getSettings().canAllowCommandsForNpcQuests() == false
&& quest.getNpcStart() != null && quest.getNpcStart().getEntity() != null
&& quest.getNpcStart().getEntity().getLocation().getWorld().getName().equals(
getPlayer().getLocation().getWorld().getName())