From 3497f7000d3a1008bd5a8645d1c66cc3af5da234 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Wed, 15 Jun 2016 17:43:51 -0500
Subject: [PATCH] Update upstreams

---
 .../Re-add-tileEntityTick.startTiming-Spigot-removed.patch      | 2 +-
 work/CraftBukkit                                                | 2 +-
 work/Spigot                                                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Spigot-Server-Patches/Re-add-tileEntityTick.startTiming-Spigot-removed.patch b/Spigot-Server-Patches/Re-add-tileEntityTick.startTiming-Spigot-removed.patch
index aba554ae65..6bbe4a8e6f 100644
--- a/Spigot-Server-Patches/Re-add-tileEntityTick.startTiming-Spigot-removed.patch
+++ b/Spigot-Server-Patches/Re-add-tileEntityTick.startTiming-Spigot-removed.patch
@@ -14,6 +14,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.methodProfiler.c("blockEntities");
 +        timings.tileEntityTick.startTiming(); // Paper - Missed Timing start from Spigot
          this.M = true;
+         timings.tileEntityTick.startTiming(); // Spigot
          // CraftBukkit start - From below, clean up tile entities before ticking them
-         if (!this.tileEntityListUnload.isEmpty()) {
 --
\ No newline at end of file
diff --git a/work/CraftBukkit b/work/CraftBukkit
index fb568fdc70..02f4218da5 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit fb568fdc70321e6325a057868bf65d1ebcba1596
+Subproject commit 02f4218da5186d0f7e627fa958e311dd0d7e8c42
diff --git a/work/Spigot b/work/Spigot
index 3ccadba36a..e50d38c387 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 3ccadba36a71e973ca556ee22bc9e147bacbda12
+Subproject commit e50d38c3872fb5067789a02dcecc5092dca1f681