From e3b3799b67b70fb2f0dc4f5b411915f46b57e07f Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 4 Feb 2017 03:59:44 -0600
Subject: [PATCH] Update upstream S

---
 .../Delay-Chunk-Unloads-based-on-Player-Movement.patch          | 2 +-
 Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch       | 2 +-
 Spigot-Server-Patches/Lighting-Queue.patch                      | 2 +-
 work/Spigot                                                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 3cd3363c91..e008fec710 100644
--- a/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -47,7 +47,7 @@ index 98f2cff15..88437d77a 100644
      public final int locZ;
      private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 279ef5de5..25deecc4d 100644
+index 57ae50d2e..0a8e09e5e 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch
index 134d4895cf..327c50e4a7 100644
--- a/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch
@@ -22,7 +22,7 @@ index 3db29161d..98f2cff15 100644
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index a6f044461..279ef5de5 100644
+index 54b454fe3..57ae50d2e 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/Lighting-Queue.patch b/Spigot-Server-Patches/Lighting-Queue.patch
index 750aba772b..a1320f4f44 100644
--- a/Spigot-Server-Patches/Lighting-Queue.patch
+++ b/Spigot-Server-Patches/Lighting-Queue.patch
@@ -85,7 +85,7 @@ index 1c0108ef1..b80f95159 100644
  
                  TileEntity tileentity;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index e18fb875f..8c015c095 100644
+index 3ba489d4f..f7f2d12cf 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/work/Spigot b/work/Spigot
index 47414001a0..b4417b8d18 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 47414001a0202ebd8bd80feb532b0ef9ce1733a9
+Subproject commit b4417b8d188ae9d59bc9fc02bbc5b08690e40f64