Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@14add2b Updated Upstream (CraftBukkit)
PaperMC/Paper@178802a Fix various 1.18.2 update issues (#7523)
This commit is contained in:
BillyGalbreath
2022-03-01 18:45:42 -06:00
parent 90adb4e4af
commit 2dc2d2c369
3 changed files with 7 additions and 7 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 f7f8e2291fa8abc88762b0b122b9b7fefc916cae..822308ff1fb9c0ba2137e2ef067e02e294d62480 100644
index 89e2c5298df7bbe82c1bc389d9d9014772d42e31..e149cca91f87645d1479156d0ff40b8b6527fefc 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2569,7 +2569,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2578,7 +2578,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