Remove debug statement and rebuild patches properly

Spigot-Server-Patches/0004-MC-Utils.patch

@@ -1,4 +1,4 @@
-From 1e7b04123a676af53fc29813810da8778f3456f3 Mon Sep 17 00:00:00 2001
+From f12b98bad12de4ca35307b5f30aad81540538aa3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -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
+@@ -88,6 +88,7 @@ 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
 @@ -85,6 +85,7 @@ public final class CraftItemStack extends ItemStack {
@@ -1148,5 +1160,5 @@ index d8358a0f0..d0b813008 100644
 +    // Paper end
  }
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0054-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From 2b1430ab1613161342f8b5cc8ea1e19ee5f90d0a Mon Sep 17 00:00:00 2001
+From 2d85b4d6ccdb57f5b99d35b4c16817f7c2cb1906 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
@@ -141,10 +141,10 @@ 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
-@@ -240,6 +240,7 @@ public class RegionFile implements AutoCloseable {
+@@ -241,6 +241,7 @@ public class RegionFile implements AutoCloseable {
                      return true;
                  }
              } catch (IOException ioexception) {
@@ -152,7 +152,7 @@ index 64be7cb97..515cc034e 100644
                  return false;
              }
          }
-@@ -308,6 +309,7 @@ public class RegionFile implements AutoCloseable {
+@@ -309,6 +310,7 @@ public class RegionFile implements AutoCloseable {
              filechannel.write(bytebuffer);
          } catch (Throwable throwable1) {
              throwable = throwable1;
@@ -306,5 +306,5 @@ index 8823f94f7..552daf437 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch

@@ -1,4 +1,4 @@
-From 994f6f6f791b76504dc1feeb6051a421a1606aea Mon Sep 17 00:00:00 2001
+From f16bb2a0b8b788e2a8158955ece3ee285c5d126e 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
@@ -6,10 +6,10 @@ 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
-@@ -240,7 +240,7 @@ public class RegionFile implements AutoCloseable {
+@@ -241,7 +241,7 @@ public class RegionFile implements AutoCloseable {
                      return true;
                  }
              } catch (IOException ioexception) {
@@ -50,5 +50,5 @@ index a7f19c849..2fe27b460 100644
  
      public void close() throws IOException {
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch

@@ -1,4 +1,4 @@
-From 2ab5173dc339abee40e5e7619906d1dd6710a3d5 Mon Sep 17 00:00:00 2001
+From e9df190e917429e60eac351992ead4b7d6e38757 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks
@@ -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
 @@ -17,6 +17,8 @@ import java.nio.file.Files;
@@ -63,7 +63,7 @@ index 877fc4be6..ebb1b6b8b 100644
  import javax.annotation.Nullable;
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
-@@ -32,13 +34,17 @@ public class RegionFile implements AutoCloseable {
+@@ -32,13 +34,16 @@ public class RegionFile implements AutoCloseable {
      private final IntBuffer g;
      private final IntBuffer h;
      private final RegionFileBitSet freeSectors;
@@ -75,22 +75,12 @@ 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])) {
-@@ -88,7 +94,7 @@ public class RegionFile implements AutoCloseable {
+@@ -380,6 +385,74 @@ 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);
- 
-@@ -379,6 +385,74 @@ public class RegionFile implements AutoCloseable {
          void run() throws IOException;
      }