Update upstream B/CB

2016-10-21 15:28:44 -05:00
parent 4708920d8d
commit 2515c80051
9 changed files with 27 additions and 126 deletions
--- a/Spigot-Server-Patches/Lighting-Queue.patch
+++ b/Spigot-Server-Patches/Lighting-Queue.patch
@@ -10,8 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
@@ -0,0 +0,0 @@ public class WorldTimingsHandler {
-     public final Timing chunkSaveNop;
-     public final Timing chunkSaveData;
+     public final Timing chunkIOStage1;
+     public final Timing chunkIOStage2;
 
 +    public final Timing lightingQueueTimer;
 +