diff --git a/Spigot-Server-Patches/Add-exception-reporting-event.patch b/Spigot-Server-Patches/Add-exception-reporting-event.patch
index 9e4d9fcdf6..b247b75d31 100644
--- a/Spigot-Server-Patches/Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/Add-exception-reporting-event.patch
@@ -141,7 +141,7 @@ index 25eb8f648..1d4eddd93 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 64be7cb97..515cc034e 100644
+index 1d0741c1e..d1f4c4724 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 {
diff --git a/Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch
index da5258ee12..eef19e9af8 100644
--- a/Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch
@@ -51,7 +51,7 @@ index db66d4ac7..2322c0c8c 100644
          a((NBTBase) nbttagcompound, dataoutput);
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 877fc4be6..ebb1b6b8b 100644
+index 4ff261091..c12fb3c10 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +0,0 @@ import java.nio.file.Files;
@@ -75,21 +75,11 @@ index 877fc4be6..ebb1b6b8b 100644
  
      public RegionFile(java.nio.file.Path java_nio_file_path, java.nio.file.Path java_nio_file_path1, RegionFileCompression regionfilecompression) throws IOException {
 +        this.file = java_nio_file_path.toFile(); // Paper
-+        System.out.println(file.toString());
          this.f = ByteBuffer.allocateDirect(8192);
 +        initOversizedState();
          this.freeSectors = new RegionFileBitSet();
          this.e = regionfilecompression;
          if (!Files.isDirectory(java_nio_file_path1, new LinkOption[0])) {
-@@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
-         return this.d.resolve(s);
-     }
- 
--    @Nullable
-+    @Nullable public synchronized DataInputStream getReadStream(ChunkCoordIntPair chunkCoordIntPair) { return a(chunkCoordIntPair);} // Paper - OBFHELPER
-     public synchronized DataInputStream a(ChunkCoordIntPair chunkcoordintpair) throws IOException {
-         int i = this.getOffset(chunkcoordintpair);
- 
 @@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
          void run() throws IOException;
      }
diff --git a/Spigot-Server-Patches/Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/Chunk-Save-Reattempt.patch
index aec25e7b1a..3e9573ebb6 100644
--- a/Spigot-Server-Patches/Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/Chunk-Save-Reattempt.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 515cc034e..5d2cbbad2 100644
+index d1f4c4724..4ff261091 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 {
diff --git a/Spigot-Server-Patches/MC-Utils.patch b/Spigot-Server-Patches/MC-Utils.patch
index 52bc8a0a52..208f1d78ed 100644
--- a/Spigot-Server-Patches/MC-Utils.patch
+++ b/Spigot-Server-Patches/MC-Utils.patch
@@ -995,6 +995,18 @@ index 6e65306a2..39339fa27 100644
      @Override
      public IBlockData getType(BlockPosition blockposition) {
          int i = blockposition.getY();
+diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
+index 8d1717340..1d0741c1e 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 {
+         return this.d.resolve(s);
+     }
+ 
++    @Nullable public synchronized DataInputStream getReadStream(ChunkCoordIntPair chunkCoordIntPair) throws IOException { return a(chunkCoordIntPair);} // Paper - OBFHELPER
+     @Nullable
+     public synchronized DataInputStream a(ChunkCoordIntPair chunkcoordintpair) throws IOException {
+         int i = this.getOffset(chunkcoordintpair);
 diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 index 8c123f265..9d0e8c2d4 100644
 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
@@ -1109,7 +1121,7 @@ index 602a395b3..66f74c106 100644
  
          return this.setTypeAndData(blockposition, fluid.getBlockData(), 3 | (flag ? 64 : 0));
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 2b280e02e..15e3edee2 100644
+index e181df6f4..4a9132c70 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {