mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
63 lines
2.6 KiB
Diff
63 lines
2.6 KiB
Diff
From 7650bdc00afbdf24bfd7808de478096637b56178 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 29 Mar 2019 01:25:11 -0400
|
|
Subject: [PATCH] Optimize Persistent Data Loading
|
|
|
|
removes Mineshaft loading legacy as we had pre 1.13.2 to avoid managing
|
|
that very large data file from legacy systems.
|
|
|
|
Previous to 1.13.2 these data files were never loaded to begin with, so they
|
|
effectively do not contain valid/relevant data.
|
|
|
|
These files take a long time to convert on large worlds and crashes the server.
|
|
|
|
Additionally, cache the result of a file being missing so we don't keep spam checking it.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
|
|
index 47a4ea9985..62081349f1 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldPersistentData.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
|
|
@@ -26,6 +26,7 @@ public class WorldPersistentData {
|
|
this.c = datafixer;
|
|
this.d = file;
|
|
}
|
|
+ private static final PersistentBase NO_RESULT = new ForcedChunk(); // Paper
|
|
|
|
private File a(String s) {
|
|
return new File(this.d, s + ".dat");
|
|
@@ -46,6 +47,7 @@ public class WorldPersistentData {
|
|
|
|
@Nullable
|
|
public <T extends PersistentBase> T b(Supplier<T> supplier, String s) {
|
|
+ if ("Mineshaft_index".equals(s) || "Mineshaft".equals(s)) return null; // Paper - mineshaft is useless data
|
|
PersistentBase persistentbase = (PersistentBase) this.data.get(s);
|
|
|
|
if (persistentbase == null) {
|
|
@@ -58,13 +60,13 @@ public class WorldPersistentData {
|
|
|
|
persistentbase.a(nbttagcompound.getCompound("data"));
|
|
this.data.put(s, persistentbase);
|
|
- }
|
|
+ } else this.data.put(s, NO_RESULT); // Paper
|
|
} catch (Exception exception) {
|
|
WorldPersistentData.LOGGER.error("Error loading saved data: {}", s, exception);
|
|
}
|
|
}
|
|
|
|
- return (T) persistentbase; // Paper - decompile fix
|
|
+ return (T) persistentbase == NO_RESULT ? null : (T) persistentbase; // Paper - decompile fix // Paper
|
|
}
|
|
|
|
public void a(PersistentBase persistentbase) {
|
|
@@ -72,6 +74,7 @@ public class WorldPersistentData {
|
|
}
|
|
|
|
public NBTTagCompound a(String s, int i) throws IOException {
|
|
+ if ("Mineshaft".equals(s) || "Mineshaft_index".equals(s)) return new NBTTagCompound(); // Paper
|
|
File file = this.a(s);
|
|
PushbackInputStream pushbackinputstream = new PushbackInputStream(new FileInputStream(file), 2);
|
|
Throwable throwable = null;
|
|
--
|
|
2.21.0
|
|
|