Update upstream B/CB/S

Remove two features added upstream
2016-08-27 18:41:58 -05:00
parent a9481ee3c7
commit fcbbc76319
14 changed files with 29 additions and 697 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 chunkIOStage1;
-     public final Timing chunkIOStage2;
+     public final Timing syncChunkLoadTileTicksTimer;
+     public final Timing syncChunkLoadPostTimer;
 
 +    public final Timing lightingQueueTimer;
 +