mirror of https://github.com/PikaMug/Quests.git
Fix external party plugin support
This commit is contained in:
parent
0520145baf
commit
b8aa2d0379
|
@ -4834,9 +4834,18 @@ public class Quester implements IQuester {
|
||||||
if (!id.equals(getUUID())) {
|
if (!id.equals(getUUID())) {
|
||||||
if (distanceSquared > 0) {
|
if (distanceSquared > 0) {
|
||||||
final Player player = Bukkit.getPlayer(id);
|
final Player player = Bukkit.getPlayer(id);
|
||||||
if (player != null && distanceSquared >= getPlayer().getLocation()
|
if (player != null) {
|
||||||
.distanceSquared(player.getLocation())) {
|
final Location locationOne = getPlayer().getLocation();
|
||||||
mq.add(plugin.getQuester(id));
|
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 {
|
} else {
|
||||||
mq.add(plugin.getQuester(id));
|
mq.add(plugin.getQuester(id));
|
||||||
|
|
|
@ -2484,7 +2484,7 @@ public class Quests extends JavaPlugin implements QuestsAPI {
|
||||||
opts.setIgnoreSilkTouch(config.getBoolean("quests." + questKey + ".options.ignore-silk-touch"));
|
opts.setIgnoreSilkTouch(config.getBoolean("quests." + questKey + ".options.ignore-silk-touch"));
|
||||||
}
|
}
|
||||||
if (config.contains("quests." + questKey + ".options.external-party-plugin")) {
|
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")) {
|
if (config.contains("quests." + questKey + ".options.use-parties-plugin")) {
|
||||||
opts.setUsePartiesPlugin(config.getBoolean("quests." + questKey + ".options.use-parties-plugin"));
|
opts.setUsePartiesPlugin(config.getBoolean("quests." + questKey + ".options.use-parties-plugin"));
|
||||||
|
|
Loading…
Reference in New Issue