Update upstreams

2016-06-15 17:43:51 -05:00
parent 03eeadc2df
commit 3497f7000d
3 changed files with 3 additions and 3 deletions
--- 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()) {
 --
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
--- a/work/Spigot
+++ b/work/Spigot