From c169c4a6854b934c10c5f59d515d186b15bf0a69 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 3 Mar 2016 20:22:48 +1100
Subject: [PATCH] Add missed chunkGC timings start

Pointed out by Andi in Spigot #53
---
 CraftBukkit-Patches/0010-Spigot-Timings.patch              | 7 ++++---
 .../0029-Allow-Disabling-of-Random-Lighting-Updates.patch  | 6 +++---
 .../0135-Limit-TNT-Detonations-per-tick.patch              | 6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CraftBukkit-Patches/0010-Spigot-Timings.patch b/CraftBukkit-Patches/0010-Spigot-Timings.patch
index 601f789c48..7faa86a575 100644
--- a/CraftBukkit-Patches/0010-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0010-Spigot-Timings.patch
@@ -1,4 +1,4 @@
-From c3a5cd66a0f950ba650db985addaed64f5f9674b Mon Sep 17 00:00:00 2001
+From d717ec80e25786019b396d00fb62f8cabf37844f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -515,7 +515,7 @@ index c5c7503..11e8de4 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 250a9f0..8678daa 100644
+index 250a9f0..ca04f24 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -219,10 +219,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -532,7 +532,7 @@ index 250a9f0..8678daa 100644
          this.methodProfiler.c("chunkSource");
          this.chunkProvider.unloadChunks();
          int j = this.a(1.0F);
-@@ -236,21 +239,35 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -236,21 +239,36 @@ public class WorldServer extends World implements IAsyncTaskHandler {
              this.worldData.setDayTime(this.worldData.getDayTime() + 1L);
          }
  
@@ -563,6 +563,7 @@ index 250a9f0..8678daa 100644
          this.ao();
 +        timings.doSounds.stopTiming(); // Spigot
  
++        timings.doChunkGC.startTiming();// Spigot
          this.getWorld().processChunkGC(); // CraftBukkit
 +        timings.doChunkGC.stopTiming(); // Spigot
      }
diff --git a/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch
index e710d9e2a7..9d2f82ccd6 100644
--- a/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch
@@ -1,4 +1,4 @@
-From f61f7fe44fc668187ee973cff84b74ed8d0b7e99 Mon Sep 17 00:00:00 2001
+From 71cd35a1527593f3c82c7461ce9552af19e3018a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
@@ -18,10 +18,10 @@ index e4725b0..20b945c 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f8a2195..7823174 100644
+index ca04f24..ffbb05d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -373,7 +373,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -374,7 +374,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
      protected void i() {
          this.methodProfiler.a("playerCheckLight");
diff --git a/CraftBukkit-Patches/0135-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0135-Limit-TNT-Detonations-per-tick.patch
index 29a2904431..15b9b1a902 100644
--- a/CraftBukkit-Patches/0135-Limit-TNT-Detonations-per-tick.patch
+++ b/CraftBukkit-Patches/0135-Limit-TNT-Detonations-per-tick.patch
@@ -1,4 +1,4 @@
-From 847098ee587927d368ea75de08e1cd65f3aba0b4 Mon Sep 17 00:00:00 2001
+From e9a46ef63c6712195a25c4d7eebb571759487cc1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Aug 2014 18:12:32 -0400
 Subject: [PATCH] Limit TNT Detonations per tick
@@ -19,10 +19,10 @@ index e467aff..35ed2a6 100644
          this.lastY = this.locY;
          this.lastZ = this.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0d6f5af..c2ca2df 100644
+index b666996..46004f0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -625,6 +625,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -626,6 +626,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
          this.worldProvider.r();
          super.tickEntities();