PaperMC/Spigot-Server-Patches/0062-Chunk-Save-Reattempt.patch

From 0d32d723ff3531d21f727f3b075ae01d98d2f989 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

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 5b48bb0b7..9299ab56a 100644
--- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -238,8 +238,7 @@ public class RegionFile {
 
             this.b(i, j, (int) (SystemUtils.getTimeMillis() / 1000L));
         } catch (IOException ioexception) {
-            ioexception.printStackTrace();
-            ServerInternalException.reportInternalException(ioexception); // Paper
+            org.spigotmc.SneakyThrow.sneaky(ioexception); // Paper - we want the upper try/catch to retry this
         }
 
     }
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index e507a996f..5dbd1d517 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -95,11 +95,29 @@ public class RegionFileCache {
 
     @Nullable
     public static synchronized void write(File file, int i, int j, NBTTagCompound nbttagcompound) throws IOException {
+        int attempts = 0; Exception laste = null; while (attempts++ < 5) { try { // Paper
         RegionFile regionfile = a(file, i, j);
 
         DataOutputStream dataoutputstream = regionfile.c(i & 31, j & 31);
         NBTCompressedStreamTools.a(nbttagcompound, (java.io.DataOutput) dataoutputstream);
         dataoutputstream.close();
+        // Paper start
+            laste = null; break; // Paper
+            } catch (Exception exception) {
+                //ChunkRegionLoader.a.error("Failed to save chunk", exception); // Paper
+                laste = exception; // Paper
+            }
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        if (laste != null) {
+            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(laste);
+            MinecraftServer.LOGGER.error("Failed to save chunk", laste);
+        }
+        // Paper end
     }
 
     public static synchronized boolean chunkExists(File file, int i, int j) {
-- 
2.20.1