Merge pull request #217 from radiant-ai/master

Use paper tick times method when available

Author: sladkoff

src/main/java/de/sldk/mc/metrics/TickDurationCollector.java

@@ -17,6 +17,12 @@ public abstract class TickDurationCollector extends Metric {
      */
     private static long[] tickDurationReference = null;
 
+    /*
+     * If this server is Paper and has a shorthand method
+     * this will be set to true to use the method instead
+     */
+    private static boolean usePaperMethod = false;
+
     public TickDurationCollector(Plugin plugin, Gauge gauge, String name) {
         super(plugin, gauge);
 
@@ -27,7 +33,17 @@ public TickDurationCollector(Plugin plugin, Gauge gauge, String name) {
          * This searches for any long[] array in the MinecraftServer class. It should
          * work across many versions of Spigot/Paper and various obfuscation mappings
          */
-        if (tickDurationReference == null) {
+        if (tickDurationReference == null && !usePaperMethod) {
+
+            /* Check if this server is Paper and has a handy method */
+            if (getPaperTickTimes() != null) {
+                usePaperMethod = true;
+                plugin.getLogger().log(Level.FINE, "Managed to get Paper tick times method.");
+                return;
+            }
+
+            plugin.getLogger().log(Level.FINE, "Could not get Paper tick times method.");
+
             long[] longestArray = null;
 
             try {
@@ -62,12 +78,42 @@ public TickDurationCollector(Plugin plugin, Gauge gauge, String name) {
         }
     }
 
+    /**
+     * Attempts to get tick times from Paper
+     * returns null if fails
+     */
+    private static long[] getPaperTickTimes() {
+        try {
+            /* Get the actual minecraft server class */
+            Server server = Bukkit.getServer();
+
+            /* Attempt to get Paper tick times method */
+            Method paperGetTickTimesMethod = server.getClass().getMethod("getTickTimes");
+
+            Object tickTimes = paperGetTickTimesMethod.invoke(server);
+
+            /* Check the method actual return type */
+            if (!(tickTimes instanceof long[])) {
+                return null;
+            }
+
+            return (long[]) tickTimes;
+        }
+        catch (Exception e) {
+            return null;
+        }
+    }
+
     /**
      * Returns either the internal minecraft long array for tick times in ns,
      * or a long array containing just one element of value -1 if reflection
      * was unable to locate the minecraft tick times buffer
      */
     protected static long[] getTickDurations() {
+        if (usePaperMethod) {
+            return getPaperTickTimes();
+        }
+
         return tickDurationReference;
     }
 }