From e1423d87ba6ace22bef87d6a457e2f554941341e Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 2 Sep 2016 22:44:52 -0500
Subject: [PATCH] Update upstream B/CB/S

---
 Spigot-API-Patches/Timings-v2.patch | 2 +-
 work/Bukkit                         | 2 +-
 work/CraftBukkit                    | 2 +-
 work/Spigot                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Spigot-API-Patches/Timings-v2.patch b/Spigot-API-Patches/Timings-v2.patch
index 8386016ad6..26be851a84 100644
--- a/Spigot-API-Patches/Timings-v2.patch
+++ b/Spigot-API-Patches/Timings-v2.patch
@@ -3365,7 +3365,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ 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
  
      /**
diff --git a/work/Bukkit b/work/Bukkit
index 89e4f83cd4..a25e56c4b6 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 89e4f83cd41117cc8a0264e70049f2f6e490740a
+Subproject commit a25e56c4b6133c9e77d0c71fc0b1db1ace430197
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 43ab2669d7..4d87c3422c 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 43ab2669d768f1a2cfe32418cd275d110691af05
+Subproject commit 4d87c3422c4f3d0576c63859e12e37c29031bbad
diff --git a/work/Spigot b/work/Spigot
index 455072c24e..f9671b84fb 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 455072c24e822b3e6f9c50ec1d3712bcefbcc92c
+Subproject commit f9671b84fbd5192fdbf13c0f9072f1d608f94f2e