From 60bc8fabed28c7876944f4f8f205bfb8f735290b Mon Sep 17 00:00:00 2001
From: darbyjack <admin@glaremasters.me>
Date: Sat, 10 Jun 2023 08:27:34 -0500
Subject: [PATCH 1/2] feat: add support for player ping in 1.20

---
 pom.xml                                               |  6 +++---
 .../papi/expansion/player/PlayerUtil.java             | 11 ++++++++++-
 .../papi/expansion/player/VersionHelper.java          |  2 ++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 79af2b0..d834a40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>com.extendedclip.papi.expansion.player</groupId>
   <artifactId>player-expansion</artifactId>
-  <version>2.0.4</version>
+  <version>2.0.5</version>
 
   <name>PAPI-Expansion-Player</name>
   <description>PlaceholderAPI expansion for player placeholders</description>
@@ -30,13 +30,13 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.19.3-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
          <groupId>me.clip</groupId>
           <artifactId>placeholderapi</artifactId>
-          <version>2.11.2</version>
+          <version>2.11.3</version>
          <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/com/extendedclip/papi/expansion/player/PlayerUtil.java b/src/main/java/com/extendedclip/papi/expansion/player/PlayerUtil.java
index 419ea5b..3254b91 100644
--- a/src/main/java/com/extendedclip/papi/expansion/player/PlayerUtil.java
+++ b/src/main/java/com/extendedclip/papi/expansion/player/PlayerUtil.java
@@ -77,7 +77,16 @@ public final class PlayerUtil {
 
             final Object entityPlayer = getHandle.invoke(player);
 
-            ping = entityPlayer.getClass().getDeclaredField(VersionHelper.IS_1_17_OR_NEWER ? "e" : "ping");
+            String pingFieldName;
+            if (VersionHelper.IS_1_20_OR_NEWER) {
+                pingFieldName = "f";
+            } else if (VersionHelper.IS_1_17_OR_NEWER) {
+                pingFieldName = "e";
+            } else {
+                pingFieldName = "ping";
+            }
+
+            ping = entityPlayer.getClass().getDeclaredField(pingFieldName);
             ping.setAccessible(true);
         }
     };
diff --git a/src/main/java/com/extendedclip/papi/expansion/player/VersionHelper.java b/src/main/java/com/extendedclip/papi/expansion/player/VersionHelper.java
index b37bd68..c3ec0ea 100644
--- a/src/main/java/com/extendedclip/papi/expansion/player/VersionHelper.java
+++ b/src/main/java/com/extendedclip/papi/expansion/player/VersionHelper.java
@@ -22,6 +22,8 @@ public final class VersionHelper {
 
     public static final boolean IS_1_17_OR_NEWER = VERSION >= 1_17_0;
 
+    public static final boolean IS_1_20_OR_NEWER = VERSION >= 1_20_0;
+
     private VersionHelper() { }
 
     /**

From b516ac0d4eb422ae7c94911aea0cdced0fe177a7 Mon Sep 17 00:00:00 2001
From: darbyjack <admin@glaremasters.me>
Date: Sat, 10 Jun 2023 09:50:00 -0500
Subject: [PATCH 2/2] fix: update version in main class as well

---
 .../com/extendedclip/papi/expansion/player/PlayerExpansion.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/extendedclip/papi/expansion/player/PlayerExpansion.java b/src/main/java/com/extendedclip/papi/expansion/player/PlayerExpansion.java
index d03af32..062c0f3 100644
--- a/src/main/java/com/extendedclip/papi/expansion/player/PlayerExpansion.java
+++ b/src/main/java/com/extendedclip/papi/expansion/player/PlayerExpansion.java
@@ -76,7 +76,7 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
 
     @Override
     public String getVersion() {
-        return "2.0.4";
+        return "2.0.5";
     }
 
     @Override