Update upstream

2016-06-22 22:18:41 -04:00
parent 7253bb10ca
commit 03553d232e
10 changed files with 18 additions and 161 deletions
--- a/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -41,9 +41,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk {
+     private boolean j;
     public final World world;
     public final int[] heightMap;
-     public final long chunkKey; // Paper
 +    public Long scheduledForUnload; // Paper - delay chunk unloads
     public final int locX;
     public final int locZ;