Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5923b7d Fix missing map initialize event call & missing map id assignment (#9756)
PaperMC/Paper@5cbce36 Handle new brand payload type
This commit is contained in:
granny
2023-09-24 14:53:01 -07:00
parent 01e013b173
commit cb4586d9e0
7 changed files with 16 additions and 16 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 eed1384d006ff167826684d59d36bafa1f617867..ff9adf5d04ad08342eeca166bd582774bf6f2cdd 100644
index 6f39e4bdafb41c3ea0ed21eb35dcfdf78c0c7ba1..7a1e26d3aa650d24687a1bbf07e9d85c94b85712 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2845,7 +2845,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2861,7 +2861,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