Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix external party plugin support

This commit is contained in:
PikaMug 2023-02-13 21:11:55 -05:00
parent 0520145baf
commit b8aa2d0379
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/me/blackvein/quests/Quester.java
View File

@ -4834,9 +4834,18 @@ public class Quester implements IQuester {
if (!id.equals(getUUID())) {
if (distanceSquared > 0) {
final Player player = Bukkit.getPlayer(id);
if (player != null && distanceSquared >= getPlayer().getLocation()
.distanceSquared(player.getLocation())) {
mq.add(plugin.getQuester(id));
if (player != null) {
final Location locationOne = getPlayer().getLocation();
final Location locationTwo = player.getLocation();
if (locationOne.getWorld() != null && locationTwo.getWorld() != null) {
if (locationOne.getWorld().getName().equals(locationTwo.getWorld()
.getName())) {
if (distanceSquared >= getPlayer().getLocation()
.distanceSquared(player.getLocation())) {
mq.add(plugin.getQuester(id));
}
}
}
}
} else {
mq.add(plugin.getQuester(id));

2
core/src/main/java/me/blackvein/quests/Quests.java
View File

@ -2484,7 +2484,7 @@ public class Quests extends JavaPlugin implements QuestsAPI {
opts.setIgnoreSilkTouch(config.getBoolean("quests." + questKey + ".options.ignore-silk-touch"));
}
if (config.contains("quests." + questKey + ".options.external-party-plugin")) {
opts.setExternalPartyPlugin(config.getString("quests." + questKey + ".external-party-plugin"));
opts.setExternalPartyPlugin(config.getString("quests." + questKey + ".options.external-party-plugin"));
}
if (config.contains("quests." + questKey + ".options.use-parties-plugin")) {
opts.setUsePartiesPlugin(config.getBoolean("quests." + questKey + ".options.use-parties-plugin"));