From 1a2ac92c279f0e16d8ae36591fa249217637090d Mon Sep 17 00:00:00 2001
From: Maroon28 <74205260+Maroon28@users.noreply.github.com>
Date: Tue, 28 Sep 2021 09:29:11 +0200
Subject: [PATCH 1/3] Update placeholderapi version

---
 core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index 93e85819..cab828e4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>

From 8a4b1320bda8f579d8100336a57837adc9a57b73 Mon Sep 17 00:00:00 2001
From: Maroon28 <74205260+Maroon28@users.noreply.github.com>
Date: Tue, 28 Sep 2021 09:33:25 +0200
Subject: [PATCH 2/3] Update methods, and make placeholders persist

Previously, when you reloaded placeholderapi, the DXL expansion would get unloaded. This aims to prevent it from unloading whenever PAPI was reloaded. It also updates the onRequest() method
---
 .../java/de/erethon/dungeonsxl/util/PlaceholderUtil.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/de/erethon/dungeonsxl/util/PlaceholderUtil.java b/core/src/main/java/de/erethon/dungeonsxl/util/PlaceholderUtil.java
index 2ccf0bc4..739d1817 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/util/PlaceholderUtil.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/util/PlaceholderUtil.java
@@ -56,9 +56,14 @@ 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 "";
         }

From b42f9ce73fff228aba6c9bc47ce17cc48263ca4e Mon Sep 17 00:00:00 2001
From: Maroon28 <74205260+Maroon28@users.noreply.github.com>
Date: Tue, 28 Sep 2021 10:07:58 +0200
Subject: [PATCH 3/3] Use player.getPlayer instead

---
 .../main/java/de/erethon/dungeonsxl/util/PlaceholderUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/de/erethon/dungeonsxl/util/PlaceholderUtil.java b/core/src/main/java/de/erethon/dungeonsxl/util/PlaceholderUtil.java
index 739d1817..256a543c 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/util/PlaceholderUtil.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/util/PlaceholderUtil.java
@@ -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
@@ -67,7 +67,7 @@ public class PlaceholderUtil extends PlaceholderExpansion {
         if (player == null) {
             return "";
         }
-        PlayerGroup group = plugin.getPlayerGroup(player);
+        PlayerGroup group = plugin.getPlayerGroup(player.getPlayer());
 
         switch (identifier) {
             case "group_members":