SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse Source 
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:
3dc4cdcd Update to Minecraft 1.14.3-pre4
88b25a8c SPIGOT-5098: Add a method to allow colored sign changes
6d913552 Update to Minecraft 1.14.3-pre4

CraftBukkit Changes:
f1f33559 Update to Minecraft 1.14.3
8a3d3f49 SPIGOT-5098: Add a method to allow colored sign changes
533290e2 SPIGOT-5100: Console warning from pig zombie targeting
6dde4b9f SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants
9af90077 SPIGOT-5097: Bukkit.clearRecipes() no longer working
38fa220f Fix setting game rules via the API
fe3930ce Update to Minecraft 1.14.3-pre4
da071ec5 Remove outdated build delay.

Spigot Changes:
4d2f30f1 Update to Minecraft 1.14.3
f16400e3 Update to Minecraft 1.14.3-pre4
This commit is contained in:
Shane Freeder
2019-06-25 02:47:58 +01:00
parent 651932f299
commit 40748b3c8d
166 changed files with 783 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Spigot-Server-Patches/Optimize-Persistent-Data-Loading.patch
View File

@@ -14,7 +14,7 @@ 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
index 00e9a17355..153809432c 100644
--- a/src/main/java/net/minecraft/server/WorldPersistentData.java
+++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
@@ -0,0 +0,0 @@ public class WorldPersistentData {
@@ -30,25 +30,29 @@ index 47a4ea9985..62081349f1 100644
@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);
T persistentbase = (T) this.data.get(s); // Paper - decompile fix
if (persistentbase == null) {
@@ -0,0 +0,0 @@ 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);
}
if (persistentbase == null && !this.data.containsKey(s)) {
persistentbase = this.c(supplier, s);
this.data.put(s, persistentbase);
+ } else { // Paper
+ this.data.put(s, NO_RESULT); // Paper
}
- return (T) persistentbase; // Paper - decompile fix
+ return (T) persistentbase == NO_RESULT ? null : (T) persistentbase; // Paper - decompile fix // Paper
- return persistentbase;
+ return persistentbase == NO_RESULT ? null : persistentbase; // Paper
}
public void a(PersistentBase persistentbase) {
@Nullable
@@ -0,0 +0,0 @@ public class WorldPersistentData {
NBTTagCompound nbttagcompound = this.a(s, SharedConstants.a().getWorldVersion());
t0.a(nbttagcompound.getCompound("data"));
- return t0;
+ return t0 == NO_RESULT ? null : t0; // Paper
}
} catch (Exception exception) {
WorldPersistentData.LOGGER.error("Error loading saved data: {}", s, exception);
@@ -0,0 +0,0 @@ public class WorldPersistentData {
}