Properly update patches for upstream merge

This commit is contained in:
Zach Brown
2016-10-21 15:42:49 -05:00
parent 2515c80051
commit 4bef47531a
6 changed files with 112 additions and 47 deletions

View File

@@ -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 chunkSaveNop;
public final Timing chunkSaveData;
+ public final Timing lightingQueueTimer;
+