Upstream update

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

@@ -1,4 +1,4 @@
-From feb30e1e5157616d1a66269983609d6fa9dc3241 Mon Sep 17 00:00:00 2001
+From 98b1fecba12a6cdde5a5c08d9dc2a84851a7669b 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
@@ -2963,7 +2963,7 @@ index 00000000..df592d85
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5649aaf7..b7c939a2 100644
+index eb6b7976..a9081ddb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -523,7 +523,6 @@ public final class Bukkit {
@@ -2975,7 +2975,7 @@ index 5649aaf7..b7c939a2 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7a08fd1e..7dd895a0 100644
+index 83b66361..bc3211f9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -945,12 +945,27 @@ public interface Server extends PluginMessageRecipient {
@@ -3230,7 +3230,7 @@ index 71709126..b886cd82 100644
              // Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 deleted file mode 100644
-index a8f61f2d..00000000
+index bba914d7..00000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
 @@ -1,253 +0,0 @@
@@ -3360,7 +3360,7 @@ index a8f61f2d..00000000
 -            for (HandlerList handlerList : HandlerList.getHandlerLists()) {
 -                for (RegisteredListener listener : handlerList.getRegisteredListeners()) {
 -                    if (listener instanceof TimedRegisteredListener) {
--                        ((TimedRegisteredListener)listener).reset();
+-                        ((TimedRegisteredListener) listener).reset();
 -                    }
 -                }
 -            }
@@ -3504,7 +3504,7 @@ index bd2cc354..d2a78f56 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index a8b4db1c..de0ef125 100644
+index b3bcda52..041a4cd7 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -292,7 +292,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
 -    }
  }
 -- 
-2.13.2
+2.13.0