From efa98483a0c6d8809112a506b38f309844be65a9 Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Thu, 12 Jul 2018 13:42:44 +0300
Subject: [PATCH] Updated CPU Usage method #631

---
 .../tasks/server/BukkitTPSCountTimer.java     | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/BukkitTPSCountTimer.java b/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/BukkitTPSCountTimer.java
index 7816b6d63..421d4b8d9 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/BukkitTPSCountTimer.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/BukkitTPSCountTimer.java
@@ -40,13 +40,7 @@ public class BukkitTPSCountTimer extends TPSCountTimer<Plan> {
      * @return the TPS
      */
     private TPS calculateTPS(long diff, long now) {
-        OperatingSystemMXBean operatingSystemMXBean = ManagementFactory.getOperatingSystemMXBean();
-        int availableProcessors = operatingSystemMXBean.getAvailableProcessors();
-        double averageCPUUsage = operatingSystemMXBean.getSystemLoadAverage() / availableProcessors * 100.0;
-
-        if (averageCPUUsage < 0) { // If unavailable, getSystemLoadAverage() returns -1
-            averageCPUUsage = -1;
-        }
+        double averageCPUUsage = getCPUUsage();
 
         Runtime runtime = Runtime.getRuntime();
 
@@ -63,6 +57,23 @@ public class BukkitTPSCountTimer extends TPSCountTimer<Plan> {
         return getTPS(diff, now, averageCPUUsage, usedMemory, entityCount, loadedChunks, playersOnline);
     }
 
+    private double getCPUUsage() {
+        double averageCPUUsage;
+
+        OperatingSystemMXBean osBean = ManagementFactory.getOperatingSystemMXBean();
+        if (osBean instanceof com.sun.management.OperatingSystemMXBean) {
+            com.sun.management.OperatingSystemMXBean nativeOsBean = (com.sun.management.OperatingSystemMXBean) osBean;
+            averageCPUUsage = nativeOsBean.getSystemCpuLoad();
+        } else {
+            int availableProcessors = osBean.getAvailableProcessors();
+            averageCPUUsage = osBean.getSystemLoadAverage() / availableProcessors;
+        }
+        if (averageCPUUsage < 0) { // If unavailable, getSystemLoadAverage() returns -1
+            averageCPUUsage = -1;
+        }
+        return averageCPUUsage * 100.0;
+    }
+
     /**
      * Gets the TPS for Spigot / Bukkit
      *