Updated Upstream (Paper) (#1169)

This commit is contained in:
frog-commits
2022-10-24 00:46:53 -04:00
committed by GitHub
parent e35f48112e
commit 74b72a5f42
23 changed files with 137 additions and 172 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 74f221c74d478e7c24e101903398219be46ddea6..55fe8b0f21f00b02e78257a64fd8d63980d50995 100644
index 31c802a2a7ebebbfb57af5ecb35ba91df58b12ea..a1af2d00d03e3326f6acd46dfaa6cdafac841727 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2698,7 +2698,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2700,7 +2700,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