Update upstream CB and rebuild

2016-04-20 11:58:49 -05:00 · 2016-04-20 11:58:49 -05:00 · 08cfefeb50
Commit 08cfefeb50
--- a/Spigot-Server-Patches/Optimize-Chunk-Unload-Queue.patch
+++ b/Spigot-Server-Patches/Optimize-Chunk-Unload-Queue.patch
@ -87,9 +87,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
     }
 
-     public Chunk getChunkAt(int i, int j, Runnable runnable) {
+     public Chunk getChunkAt(int i, int j, Runnable runnable, boolean generate) {
 -        unloadQueue.remove(i, j);
 +        //unloadQueue.remove(i, j); // Paper
+
         Chunk chunk = chunks.get(LongHash.toLong(i, j));
         ChunkRegionLoader loader = null;
 
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit b70058afa240034895eb061b123643a708a53480
+Subproject commit b103841da3263c7bce42ec5e4331ebc821bfd65e