diff --git a/main/pom.xml b/main/pom.xml index be5703c35..4f4519df5 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -19,10 +19,15 @@ https://jitpack.io - + codemc-repo https://repo.codemc.org/repository/maven-public/ + + + dre-repo + http://erethon.de/repo + spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ @@ -117,9 +122,9 @@ provided - com.github.DRE2N - DungeonsXL - -6523caa908-1 + de.erethon.dungeonsxl + dungeonsxl-dist + 0.18-SNAPSHOT provided diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index eeb4ff25f..fda9f90ed 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -3760,9 +3760,9 @@ public class Quester { } if (plugin.getDependencies().getDungeonsApi() != null) { if (quest.getOptions().getUseDungeonsXLPlugin()) { - DGroup group = DGroup.getByPlayer(getPlayer()); + DGroup group = (DGroup) plugin.getDependencies().getDungeonsApi().getPlayerGroup(getPlayer()); if (group != null) { - for (UUID id : group.getPlayers()) { + for (UUID id : group.getMembers()) { if (!id.equals(getUUID())) { mq.add(plugin.getQuester(id)); } diff --git a/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java b/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java index aff9f5c58..41c3ed2a4 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java @@ -42,7 +42,7 @@ public class DungeonsListener implements Listener { @EventHandler public void onPlayerJoinEvent(DPlayerJoinDGroupEvent event) { if (event.getDGroup() != null && event.getDPlayer() != null) { - Player i = event.getDGroup().getCaptain(); + Player i = event.getDGroup().getLeader(); Player p = event.getDPlayer().getPlayer(); if (i != null && p != null) { if (Lang.get("questDungeonsInvite").length() > 0) { @@ -59,7 +59,7 @@ public class DungeonsListener implements Listener { @EventHandler public void onPlayerLeaveEvent(DPlayerLeaveDGroupEvent event) { if (event.getDGroup() != null && event.getDPlayer() != null) { - Player k = event.getDGroup().getCaptain(); + Player k = event.getDGroup().getLeader(); Player p = event.getDPlayer().getPlayer(); if (k != null && p != null) { if (Lang.get("questDungeonsKicked").length() > 0) { diff --git a/main/src/main/java/me/blackvein/quests/tasks/ActionTimer.java b/main/src/main/java/me/blackvein/quests/tasks/ActionTimer.java index 19d5d76fc..5788f5614 100644 --- a/main/src/main/java/me/blackvein/quests/tasks/ActionTimer.java +++ b/main/src/main/java/me/blackvein/quests/tasks/ActionTimer.java @@ -12,9 +12,9 @@ package me.blackvein.quests.tasks; +import org.bukkit.ChatColor; import org.bukkit.scheduler.BukkitRunnable; -import de.erethon.dungeonsxl.util.commons.chat.ChatColor; import me.blackvein.quests.Quest; import me.blackvein.quests.Quester; import me.blackvein.quests.util.Lang; diff --git a/main/src/main/resources/strings.yml b/main/src/main/resources/strings.yml index c103ce039..b894794b3 100644 --- a/main/src/main/resources/strings.yml +++ b/main/src/main/resources/strings.yml @@ -73,9 +73,9 @@ questRequiredNoneSet: "Required, none set" questDungeonsCreate: "Players added to this group may perform quests together!" questDungeonsDisband: "The quest group was disbanded." questDungeonsInvite: " can now perform quests with you!" -questDungeonsJoin: "You can now perform quests with Captain ." +questDungeonsJoin: "You can now perform quests with Leader ." questDungeonsKicked: " can no longer perform quests with you." -questDungeonsLeave: "You can no longer perform quests with Captain ." +questDungeonsLeave: "You can no longer perform quests with Leader ." questPartiesCreate: "Players added to this party may perform quests together!" questPartiesDelete: "The quest party was disbanded." questPartiesInvite: " can now perform quests with you!"