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

Merge branch 'master' of https://github.com/DRE2N/DungeonsXL

This commit is contained in:
Daniel Saukel 2021-10-22 23:24:43 +02:00
parent 50a8374b1c b582dc955c
commit 84b8dd761e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/pom.xml
View File

@ -122,7 +122,7 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.10.9</version>
<version>2.10.10</version>
<scope>provided</scope>
</dependency>
<dependency>

11
core/src/main/java/de/erethon/dungeonsxl/util/PlaceholderUtil.java
View File

@ -21,7 +21,7 @@ import de.erethon.dungeonsxl.api.dungeon.Game;
import de.erethon.dungeonsxl.api.player.PlayerGroup;
import de.erethon.dungeonsxl.api.world.GameWorld;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.entity.Player;
import org.bukkit.OfflinePlayer;
/**
* @author Daniel Saukel
@ -56,13 +56,18 @@ public class PlaceholderUtil extends PlaceholderExpansion {
public String getVersion() {
return plugin.getDescription().getVersion();
}
@Override
public boolean persist() {
return true;
}
@Override
public String onPlaceholderRequest(Player player, String identifier) {
public String onRequest(OfflinePlayer player, String identifier) {
if (player == null) {
return "";
}
PlayerGroup group = plugin.getPlayerGroup(player);
PlayerGroup group = plugin.getPlayerGroup(player.getPlayer());
switch (identifier) {
case "group_members":