From 3e2785e893872375e49c0565c801df502bc1a616 Mon Sep 17 00:00:00 2001 From: Aikar 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 0f1c74dd33..9626396745 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -276,8 +276,7 @@ public class RegionFile { this.b(i, j, (int) (SystemUtils.getTimeMillis() / 1000L)); } catch (IOException ioexception) { - ioexception.printStackTrace(); - ServerInternalException.reportInternalException(ioexception); // Paper + com.destroystokyo.paper.util.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 e507a996f1..5dbd1d517a 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