Merge pull request #434 from kashike/fix/timings-verbose

Fix @aikar's oops with verbose timings

Spigot-API-Patches/0003-Timings-v2.patch

@@ -1,4 +1,4 @@
-From e555f871d5cc6a7402bd59651f8e919302f4d9f1 Mon Sep 17 00:00:00 2001
+From 56bac601f45228492f57f6edd5b4daba183343fc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -1183,7 +1183,7 @@ index 0000000..623dda4
 +}
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
 new file mode 100644
-index 0000000..0f7be03
+index 0000000..4e5cf35
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timings.java
 @@ -0,0 +1,273 @@
@@ -1327,7 +1327,7 @@ index 0000000..0f7be03
 +     * @return Enabled or not
 +     */
 +    public static boolean isVerboseTimingsEnabled() {
-+        return timingsEnabled;
++        return verboseEnabled;
 +    }
 +
 +    /**
@@ -3656,5 +3656,5 @@ index 8d98297..7e89b97 100644
 -    }
  }
 -- 
-2.9.3
+2.5.0