geforkt von Mirrors/Paper
fb25dc17c6
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 0cef14e4 Remove draft API from selectEntities CraftBukkit Changes:a46fdbc6Remove outdated build delay.3697519bSPIGOT-4708: Fix ExactChoice recipes neglecting material9ead7009SPIGOT-4677: Add minecraft.admin.command_feedback permissionc3749a23Remove the Damage tag from items when it is 0.f74c7b95SPIGOT-4706: Can't interact with active item494eef45Mention requirement of JIRA ticket for bug fixes51d62decSPIGOT-4702: Exception when middle clicking certain slotsbe557e69SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
62 Zeilen
2.5 KiB
Diff
62 Zeilen
2.5 KiB
Diff
From d0f37a6611ca8b011d391ced8e259e23b78aaee9 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Mon, 15 Apr 2019 02:24:52 +0100
|
|
Subject: [PATCH] Handle bad chunks more gracefully
|
|
|
|
Prior to this change the server would crash when attempting to load a
|
|
chunk from a region with bad data.
|
|
|
|
After this change the server will defer back to vanilla behavior. At
|
|
this time, that means attempting to generate a chunk in its place
|
|
(and occasionally just not generating anything and leaving small
|
|
holes in the world (This statement might not be accurate as of 1.13.x)).
|
|
|
|
Should Mojang choose to alter this behavior in the future, this change
|
|
will simply defer to whatever that new behavior is.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
index 17e76815ad..369aaa84c4 100644
|
|
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
@@ -171,8 +171,20 @@ public class RegionFileCache {
|
|
private static NBTTagCompound readOversizedChunk(RegionFile regionfile, int i, int j) throws IOException {
|
|
synchronized (regionfile) {
|
|
try (DataInputStream datainputstream = regionfile.getReadStream(i & 31, j & 31)) {
|
|
- NBTTagCompound oversizedData = regionfile.getOversizedData(i, j);
|
|
- NBTTagCompound chunk = NBTCompressedStreamTools.readNBT(datainputstream);
|
|
+ // Paper start - Handle bad chunks more gracefully - also handle similarly with oversized data
|
|
+ NBTTagCompound oversizedData = null;
|
|
+
|
|
+ try {
|
|
+ oversizedData = regionfile.getOversizedData(i, j);
|
|
+ } catch (Exception ex) {}
|
|
+
|
|
+ NBTTagCompound chunk;
|
|
+ try {
|
|
+ chunk = NBTCompressedStreamTools.readNBT(datainputstream);
|
|
+ } catch (Exception ex) {
|
|
+ return null;
|
|
+ }
|
|
+ // Paper end
|
|
if (oversizedData == null) {
|
|
return chunk;
|
|
}
|
|
@@ -251,7 +263,13 @@ public class RegionFileCache {
|
|
return null;
|
|
}
|
|
|
|
- return NBTCompressedStreamTools.a(datainputstream);
|
|
+ // Paper start - Handle bad chunks more gracefully
|
|
+ try {
|
|
+ return NBTCompressedStreamTools.a(datainputstream);
|
|
+ } catch (Exception ex) {
|
|
+ return null;
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
|
|
@Nullable
|
|
--
|
|
2.21.0
|
|
|