Update upstreams

This commit is contained in:
Zach Brown 2016-06-15 17:43:51 -05:00
parent 03eeadc2df
commit 3497f7000d
3 changed files with 3 additions and 3 deletions

View File

@ -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()) {
--

@ -1 +1 @@
Subproject commit fb568fdc70321e6325a057868bf65d1ebcba1596
Subproject commit 02f4218da5186d0f7e627fa958e311dd0d7e8c42

@ -1 +1 @@
Subproject commit 3ccadba36a71e973ca556ee22bc9e147bacbda12
Subproject commit e50d38c3872fb5067789a02dcecc5092dca1f681