mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 20:07:41 +01:00
e82ef9ec05
ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 11 Aug 2018 00:49:20 -0400
|
|
Subject: [PATCH] Detect and repair corrupt Region Files
|
|
|
|
If the file has partial data written but not the full 8192 bytes,
|
|
then the server will be unable to load that region file...
|
|
|
|
I don't know why mojang only checks for 4096, when anything less than 8192 is a crash.
|
|
|
|
But to be safe, it will attempt to back up the file.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
|
|
index 5d2853b9ce..c35974aa7c 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 {
|
|
}
|
|
|
|
this.c = new RandomAccessFile(file1, "rw");
|
|
- if (this.c.length() < 4096L) {
|
|
+ // Paper start - detect and fix incomplete headers
|
|
+ long length = this.c.length();
|
|
+ if (length < 8192 && length > 0) {
|
|
+ File corrupt = new File(file1.getParentFile(), file1.getName() + ".bak");
|
|
+ org.apache.logging.log4j.Logger logger = org.apache.logging.log4j.LogManager.getLogger();
|
|
+ logger.error("Region file " + file1 + " was incomplete. Backing up to " + corrupt + " and repairing");
|
|
+ try {
|
|
+ java.nio.file.Files.copy(file1.toPath(), corrupt.toPath());
|
|
+ } catch (IOException e) {
|
|
+ logger.error("Error backing up corrupt file", e);
|
|
+ }
|
|
+ }
|
|
+ if (length < 8192L) {
|
|
+ // Paper end
|
|
this.c.write(a);
|
|
this.c.write(a);
|
|
this.g += 8192;
|
|
--
|