Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-06-30 16:44:53 +02:00
Code Issues Projects Releases Wiki Activity

Support recent builds of DungeonsXL 0.18

Browse Source
This commit is contained in:
PikaMug 2020-04-15 01:51:34 -04:00
parent 36a2e865aa
commit 311eac2d28
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/pom.xml
View File

@ -19,10 +19,15 @@
<url>https://jitpack.io</url>
</repository>
<repository>
<!-- Parties repo -->
<!-- Parties -->
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
</repository>
<repository>
<!-- DungeonsXL -->
<id>dre-repo</id>
<url>http://erethon.de/repo</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@ -117,9 +122,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.DRE2N</groupId>
<artifactId>DungeonsXL</artifactId>
<version>-6523caa908-1</version>
<groupId>de.erethon.dungeonsxl</groupId>
<artifactId>dungeonsxl-dist</artifactId>
<version>0.18-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

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

@ -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));
}

4
main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java
View File

@ -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) {

2
main/src/main/java/me/blackvein/quests/tasks/ActionTimer.java
View File

@ -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;

4
main/src/main/resources/strings.yml
View File

@ -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: "<player> can now perform quests with you!"
questDungeonsJoin: "You can now perform quests with Captain <player>."
questDungeonsJoin: "You can now perform quests with Leader <player>."
questDungeonsKicked: "<player> can no longer perform quests with you."
questDungeonsLeave: "You can no longer perform quests with Captain <player>."
questDungeonsLeave: "You can no longer perform quests with Leader <player>."
questPartiesCreate: "Players added to this party may perform quests together!"
questPartiesDelete: "The quest party was disbanded."
questPartiesInvite: "<player> can now perform quests with you!"