Reimplemented how server version is get to support the new paper-spig…

…ot updates.
RMJTromp · Jun 18, 2024 · 788d7b6 · 788d7b6
1 parent f52ec47
commit 788d7b6
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/main/java/com/rmjtromp/chatemojis/utils/BukkitUtils.java b/src/main/java/com/rmjtromp/chatemojis/utils/BukkitUtils.java
@@ -33,8 +33,14 @@ public static Plugin getPlugin() {
      * Returns the server version for reflection use
      * @return Server Version
      */
+    private static boolean hasVersionInPackageName = true;
     public static String getServerVersion() {
-        return Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
+        try {
+            return Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            hasVersionInPackageName = false;
+            return "v" + Bukkit.getBukkitVersion().replace(".", "_");
+        }
     }
 
     /**
@@ -81,7 +87,12 @@ public static List<String> colorEncode(String...strings) {
      * @throws ClassNotFoundException Thrown if class could not be found
      */
     public static Class<?> getClass(@Pattern("^.+?\\.%s\\..+$") @NotNull String string) throws ClassNotFoundException {
-        return Class.forName(String.format(string, BukkitUtils.getServerVersion()));
+        String version = BukkitUtils.getServerVersion();
+
+        if(hasVersionInPackageName)
+            return Class.forName(String.format(string, version));
+
+        return Class.forName(string.replace(".%s", ""));
     }
 
 }