Update upstream B/CB

Closes GH-569

Spigot-API-Patches/0005-Add-getTPS-method.patch

@@ -1,46 +1,50 @@
-From 4af32b49e181ea1b8eff460f6d5906e3415d0a4b Mon Sep 17 00:00:00 2001
+From 89cb7c72eef5269f43decc17a24bc748f00c8616 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:24:57 -0600
 Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 07530ff..ed646ca 100644
+index 7fd544e..3b16953 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1133,6 +1133,14 @@ public final class Bukkit {
+@@ -1142,6 +1142,16 @@ public final class Bukkit {
+         return server.getEntity(uuid);
      }
  
-     /**
++    // Paper start
++    /**
 +     * Gets the current server TPS
 +     * @return current server TPS (1m, 5m, 15m in Paper-Server)
 +     */
 +    public static double[] getTPS() {
 +        return server.getTPS();
 +    }
++    // Paper end
 +
-+    /**
+     /**
       * @see UnsafeValues
       * @return the unsafe values instance
-      */
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 36d0be2..09f921a 100644
+index 77cfe56..a4e6894 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -927,6 +927,13 @@ public interface Server extends PluginMessageRecipient {
-     BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag ...flags);
+@@ -934,6 +934,15 @@ public interface Server extends PluginMessageRecipient {
+      */
+     Entity getEntity(UUID uuid);
  
-     /**
++    // Paper start
++    /**
 +     * Gets the current server TPS
 +     *
 +     * @return current server TPS (1m, 5m, 15m in Paper-Server)
 +     */
 +    public double[] getTPS();
++    // Paper end
 +
-+    /**
+     /**
       * @see UnsafeValues
       * @return the unsafe values instance
-      */
 -- 
-2.10.2
+2.9.3