aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch')
-rw-r--r--patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 11b3f65cb3..0542a5f892 100644
--- a/patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0692-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a3ef919ff07655e835a1b423b3d4f71939a47db8..fa4a6f519a4611fe896210a97aeb334e1fae039d 100644
+index 424d6fee9f5663371082fce4e23b6dc9282a591f..9d17813757f968624231b53aa1f895f5d25ab5d8 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2682,6 +2682,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2692,6 +2692,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot end
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message