Properly update patches for upstream merge

2016-10-21 15:42:49 -05:00
parent 2515c80051
commit 4bef47531a
6 changed files with 112 additions and 47 deletions
--- a/Spigot-Server-Patches/Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/Disable-Vanilla-Chunk-GC.patch
@@ -10,8 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
- 
             chunkproviderserver.a(flag);
+             timings.worldSaveChunks.stopTiming(); // Paper
             // CraftBukkit - ArrayList -> Collection
 -            Collection arraylist = chunkproviderserver.a();
 +            /* //Paper start Collection arraylist = chunkproviderserver.a();
@@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            }
 +            }*/
 +            // Paper end
- 
+             timings.worldSave.stopTiming(); // Paper
         }
     }
 --