Merge pull request #50 from Xitee1/1.20.6-support

MC 1.20.6 support
Xitee1 · May 25, 2024 · f266de4 · f266de4
2 parents 92d8cc8 + 3f0d3ae
commit f266de4
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/main/java/de/xite/scoreboard/versions/VersionSpecific.java b/src/main/java/de/xite/scoreboard/versions/VersionSpecific.java
@@ -9,7 +9,7 @@
 import java.util.logging.Logger;
 
 public abstract class VersionSpecific {
-	public static final String NMS_VERSION = Bukkit.getServer().getClass().getPackage().getName().substring(23);
+	public static String NMS_VERSION;
 	protected static final Logger logger = PowerBoard.pl.getLogger();
 
 	public static VersionSpecific current;
@@ -28,6 +28,12 @@ public int getPing(Player p) {
 
 
     public static void init() {
+	    String packageVersion = Bukkit.getServer().getClass().getPackage().getName();
+		if(!packageVersion.equals("org.bukkit.craftbukkit")) {
+			// Minecraft 1.20.4 and below
+			NMS_VERSION = Bukkit.getServer().getClass().getPackage().getName().substring(23);
+		}
+
         if (Version.CURRENT.isAtLeast(Version.v1_17)) {
             current = new version_1_17_later();
         } else if (Version.CURRENT.isAtLeast(Version.v1_16)) {
@@ -63,17 +69,17 @@ public void sendTab(Player p, String header, String footer) {
 
     // ------------------------------ Reflection / NMS stuff ------------------------------
 
-    protected final Class<?> craftPlayer;
-
-    {
-        try {
-            craftPlayer = Class.forName("org.bukkit.craftbukkit." + NMS_VERSION + ".entity.CraftPlayer");
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
+    protected Class<?> craftPlayer = null;
 
     protected final Object nmsPlayer(Player p) {
+		if(craftPlayer == null) {
+			try {
+				craftPlayer = Class.forName("org.bukkit.craftbukkit." + NMS_VERSION + ".entity.CraftPlayer");
+			} catch (ClassNotFoundException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
         try {
             return craftPlayer.getMethod("getHandle").invoke(p);
         } catch (ReflectiveOperationException ex) {