From 08cfefeb50b54547215017faa8ba358b0e9e4c13 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Wed, 20 Apr 2016 11:58:49 -0500
Subject: [PATCH] Update upstream CB and rebuild

---
 Spigot-Server-Patches/Optimize-Chunk-Unload-Queue.patch | 3 ++-
 work/CraftBukkit                                        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Spigot-Server-Patches/Optimize-Chunk-Unload-Queue.patch b/Spigot-Server-Patches/Optimize-Chunk-Unload-Queue.patch
index 3094587be1..f9ee97bec6 100644
--- 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;
  
diff --git a/work/CraftBukkit b/work/CraftBukkit
index b70058afa2..b103841da3 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit b70058afa240034895eb061b123643a708a53480
+Subproject commit b103841da3263c7bce42ec5e4331ebc821bfd65e