Add more precise data version for newer versions

saicone · Apr 30, 2024 · 7586c7e · 7586c7e
1 parent 15f359b
commit 7586c7e
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/src/main/java/com/saicone/rtag/util/ServerInstance.java b/src/main/java/com/saicone/rtag/util/ServerInstance.java
@@ -99,18 +99,14 @@ public class ServerInstance {
             }
             FULL_VERSION = Integer.parseInt(String.join("", split));
 
-            DATA_VERSION = dataVersion(FULL_VERSION);
+            if (MAJOR_VERSION >= 13) {
+                DATA_VERSION = getDataVersion(serverPackage);
+            } else {
+                DATA_VERSION = dataVersion(FULL_VERSION);
+            }
         } else {
             // CraftBukkit without relocation detected, let's get data version first (only for +1.13 servers)
-            int data = Integer.MAX_VALUE;
-            try {
-                final Class<?> magicNumbersClass = Class.forName(serverPackage + ".util.CraftMagicNumbers");
-                final Object craftMagicNumbers = magicNumbersClass.getDeclaredField("INSTANCE").get(null);
-                data = (int) magicNumbersClass.getDeclaredMethod("getDataVersion").invoke(craftMagicNumbers);
-            } catch (Throwable t) {
-                t.printStackTrace();
-            }
-            DATA_VERSION = data;
+            DATA_VERSION = getDataVersion(serverPackage);
 
             // Get all version values using data version
             PACKAGE_VERSION = version(DATA_VERSION);
@@ -127,6 +123,17 @@ public class ServerInstance {
     ServerInstance() {
     }
 
+    private static int getDataVersion(String serverPackage) {
+        try {
+            final Class<?> magicNumbersClass = Class.forName(serverPackage + ".util.CraftMagicNumbers");
+            final Object craftMagicNumbers = magicNumbersClass.getDeclaredField("INSTANCE").get(null);
+            return (int) magicNumbersClass.getDeclaredMethod("getDataVersion").invoke(craftMagicNumbers);
+        } catch (Throwable t) {
+            t.printStackTrace();
+            return Integer.MAX_VALUE;
+        }
+    }
+
     /**
      * Server releases subclass with versions that introduces major changes.
      */