Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@196271d Fix save problems on shutdown
PaperMC/Paper@1e12cf8 Add more to the save fixes
This commit is contained in:
BillyGalbreath
2022-03-05 21:56:04 -06:00
parent 498f646f40
commit 3e8b148a1f
12 changed files with 29 additions and 29 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 89e2c5298df7bbe82c1bc389d9d9014772d42e31..e149cca91f87645d1479156d0ff40b8b6527fefc 100644
index 93ed9419752c6bf482ef576ff8ed7ead76c43fe6..4f584e1b6235f535a6023f97ae24785f0b271bcb 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2578,7 +2578,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2584,7 +2584,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
// Paper start