Update upstream B/CB/S

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

@@ -1,4 +1,4 @@
-From 5d5dc477a6998af553a15def100d0ef1407b6dba Mon Sep 17 00:00:00 2001
+From 64f62bc4e2c8b60a6679fbcc608d1a5ee8fe7944 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
@@ -3610,10 +3610,10 @@ index 80c6a72e..759c4617 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 4cffa137..b2cbf9e4 100644
+index d7d5ac7b..a657fce5 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -15,7 +15,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
+@@ -23,7 +23,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
  /**
   * A ClassLoader for plugins, to allow shared classes across multiple plugins
   */
@@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
 -    }
  }
 -- 
-2.15.0
+2.15.1.windows.2