Update upstream B/CB/S

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

@@ -1,4 +1,4 @@
-From 3772e09053af9dd7d76f320160f2bd0cb38ea155 Mon Sep 17 00:00:00 2001
+From e555f871d5cc6a7402bd59651f8e919302f4d9f1 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
@@ -3351,7 +3351,7 @@ index 1056186..4ee123e 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index a1d174f..6b159ed 100644
+index 80c6a72..759c461 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -40,7 +40,6 @@ import org.bukkit.plugin.PluginLoader;
@@ -3365,12 +3365,12 @@ index a1d174f..6b159ed 100644
 @@ -51,7 +50,6 @@ public final class JavaPluginLoader implements PluginLoader {
      private final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), };
      private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
-     private final Map<String, PluginClassLoader> loaders = Collections.synchronizedMap(new LinkedHashMap<String, PluginClassLoader>());
+     private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
 -    public static final CustomTimingsHandler pluginParentTimer = new CustomTimingsHandler("** Plugins"); // Spigot
  
      /**
       * This class was not meant to be constructed explicitly
-@@ -291,26 +289,20 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -289,26 +287,20 @@ public final class JavaPluginLoader implements PluginLoader {
                  }
              }
  
@@ -3656,5 +3656,5 @@ index 8d98297..7e89b97 100644
 -    }
  }
 -- 
-2.9.2.windows.1
+2.9.3