From cead4e0a74fd15673d4cbba6c657098f70047696 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 6 Dec 2016 17:12:19 -0600
Subject: [PATCH] Update upstream B/CB

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

diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch
index a9359f6d2e..e135a1ea18 100644
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@@ -938,8 +938,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              int l = 49;
              Iterator iterator1 = this.h.iterator();
 @@ -0,0 +0,0 @@ public class PlayerChunkMap {
-                     }
                  }
+                 // CraftBukkit end
              }
 +            } // Paper timing
          }
diff --git a/work/Bukkit b/work/Bukkit
index 71d3a3c774..b7a392c072 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 71d3a3c774a2b53458456c49cf6dd2796934ef2d
+Subproject commit b7a392c072a92bdeef8e6fc1e2849740bdb1ccca
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a710176e46..58bff62b2d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a710176e461fa6192521afdee74b3f9bc315065d
+Subproject commit 58bff62b2dc68da958f2e90371582a13aa3c9355