diff --git a/Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch
index 4654aabe9c..65b9dfc639 100644
--- a/Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch
@@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-index 9fd8a75dae..d49afd622e 100644
+index 9fd8a75da..d49afd622 100644
 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 @@ -0,0 +0,0 @@ public class NBTCompressedStreamTools {
@@ -51,7 +51,7 @@ index 9fd8a75dae..d49afd622e 100644
          a((NBTBase) nbttagcompound, dataoutput);
      }
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index b7c94fe238..80eea5dfbd 100644
+index b7c94fe23..80eea5dfb 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -0,0 +0,0 @@ import java.util.Objects;
@@ -64,7 +64,7 @@ index b7c94fe238..80eea5dfbd 100644
  
      public NBTTagList() {}
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 17648c1c04..86ae53fed3 100644
+index e90ef45ee..ccc3d6c7a 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
@@ -86,7 +86,7 @@ index 17648c1c04..86ae53fed3 100644
              this.b.write(RegionFile.a);
 @@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
          }
-         header.clear();
+         ((java.nio.Buffer) header).clear();
          java.nio.IntBuffer headerAsInts = header.asIntBuffer();
 +        initOversizedState();
          // Paper End
@@ -286,7 +286,7 @@ index 17648c1c04..86ae53fed3 100644
 +
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 8718811655..c53518a477 100644
+index 871881165..c53518a47 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -0,0 +0,0 @@ public abstract class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/Avoid-hopper-searches-if-there-are-no-items.patch
index e0e85d6521..864c312232 100644
--- a/Spigot-Server-Patches/Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/Avoid-hopper-searches-if-there-are-no-items.patch
@@ -13,7 +13,6 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 
 Combined, this adds up a lot.
 
-
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
 index d604f96c1..67dc837f4 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
diff --git a/Spigot-Server-Patches/Fixed-MC-156852.patch b/Spigot-Server-Patches/Fixed-MC-156852.patch
index 54dc3cdb1a..0e43e64dba 100644
--- a/Spigot-Server-Patches/Fixed-MC-156852.patch
+++ b/Spigot-Server-Patches/Fixed-MC-156852.patch
@@ -12,7 +12,7 @@ issue in 1.8-1.12.
 Originally solved by Gnembon on MC-5694 at bugs.mojang.com
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index e5e9de542..3e338ad45 100644
+index e5e9de542..c96564a59 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -0,0 +0,0 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/Reduce-IO-ops-opening-a-new-region-file.patch
index c460ede6fe..95e2776cf3 100644
--- a/Spigot-Server-Patches/Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/Reduce-IO-ops-opening-a-new-region-file.patch
@@ -5,7 +5,7 @@ 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 fb529eac91..3aeac69c26 100644
+index fb529eac9..faf425588 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
@@ -26,7 +26,7 @@ index fb529eac91..3aeac69c26 100644
 +        while (header.hasRemaining())  {
 +            if (this.getDataFile().getChannel().read(header) == -1) throw new java.io.EOFException();
 +        }
-+        header.clear();
++        ((java.nio.Buffer) header).clear();
 +        java.nio.IntBuffer headerAsInts = header.asIntBuffer();
 +        // Paper End
 +