diff --git a/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch
index 1973c77c39..6c7e7614bf 100644
--- a/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 80c1bfdf97a5e070c7e68f95f38573e30abaac07 Mon Sep 17 00:00:00 2001
+From a01d836fc14857d7c4fd3dc5e69285107316b9bb Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -198,7 +198,7 @@ index 936d6c6..50056f4 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index e18e9bc..2badf24 100644
+index 19fea50..c9bd856 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -1,5 +1,6 @@
@@ -208,7 +208,7 @@ index e18e9bc..2badf24 100644
  import com.google.common.collect.Lists;
  import java.io.BufferedInputStream;
  import java.io.BufferedOutputStream;
-@@ -82,6 +83,7 @@ public class RegionFile {
+@@ -81,6 +82,7 @@ public class RegionFile {
              }
          } catch (IOException ioexception) {
              ioexception.printStackTrace();
@@ -216,7 +216,7 @@ index e18e9bc..2badf24 100644
          }
  
      }
-@@ -246,6 +248,7 @@ public class RegionFile {
+@@ -245,6 +247,7 @@ public class RegionFile {
              this.b(i, j, (int) (MinecraftServer.av() / 1000L));
          } catch (IOException ioexception) {
              ioexception.printStackTrace();
@@ -372,5 +372,5 @@ index 2a22697..d82dddf 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.8.3.windows.1
+2.8.3
 
diff --git a/Spigot-Server-Patches/0078-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0078-Chunk-Save-Reattempt.patch
index e91bc28671..9e8f3c0752 100644
--- a/Spigot-Server-Patches/0078-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0078-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 5ec66352ed0784f04a459c49ad3a41cd805ef395 Mon Sep 17 00:00:00 2001
+From 75189c880180b4e629a100e7672b7e7e43686232 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -28,10 +28,10 @@ index d4386e3..facc97b 100644
                  synchronized (lock) { if (this.b.get(chunkcoordintpair) == nbttagcompound) { this.b.remove(chunkcoordintpair); } }// Paper - This will not equal if a newer version is still pending
  
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 2badf24..6dbc80e 100644
+index c9bd856..1fe5019 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
-@@ -247,8 +247,7 @@ public class RegionFile {
+@@ -246,8 +246,7 @@ public class RegionFile {
  
              this.b(i, j, (int) (MinecraftServer.av() / 1000L));
          } catch (IOException ioexception) {
diff --git a/Spigot-Server-Patches/0112-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0112-Reduce-IO-ops-opening-a-new-region-file.patch
index b8d331c426..72486685e3 100644
--- a/Spigot-Server-Patches/0112-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0112-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,11 +1,11 @@
-From 326596068a37cd1f26e139efd932c2cdb30622dc Mon Sep 17 00:00:00 2001
+From 24ef5650af1017f32574f590506aab75ce21b55e Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
 
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 6dbc80e..81bcd84 100644
+index 1fe5019..45d490e 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -8,9 +8,12 @@ import java.io.ByteArrayInputStream;
@@ -21,7 +21,7 @@ index 6dbc80e..81bcd84 100644
  import java.util.List;
  import java.util.zip.DeflaterOutputStream;
  import java.util.zip.GZIPInputStream;
-@@ -67,8 +70,16 @@ public class RegionFile {
+@@ -66,8 +69,16 @@ public class RegionFile {
  
              int k;
  
@@ -39,7 +39,7 @@ index 6dbc80e..81bcd84 100644
                  this.d[j] = k;
                  if (k != 0 && (k >> 8) + (k & 255) <= this.f.size()) {
                      for (int l = 0; l < (k & 255); ++l) {
-@@ -78,7 +89,7 @@ public class RegionFile {
+@@ -77,7 +88,7 @@ public class RegionFile {
              }
  
              for (j = 0; j < 1024; ++j) {
diff --git a/work/Bukkit b/work/Bukkit
index 268e8e7836..eb9f4ee387 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 268e8e7836982a63dea448c0ef6f4dae020de23a
+Subproject commit eb9f4ee387c12e0179e32cd581575d79d2b93ec5
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 02f4218da5..9856d8a183 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 02f4218da5186d0f7e627fa958e311dd0d7e8c42
+Subproject commit 9856d8a18395617ffa0ecc05dcbf9255e6a66d12
diff --git a/work/Spigot b/work/Spigot
index e50d38c387..c55900f728 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit e50d38c3872fb5067789a02dcecc5092dca1f681
+Subproject commit c55900f7285842593df7101bf7ee81516aacb0c5