summaryrefslogtreecommitdiffhomepage
path: root/patches/server/0609-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0609-Fix-merchant-inventory-not-closing-on-entity-removal.patch')
-rw-r--r--patches/server/0609-Fix-merchant-inventory-not-closing-on-entity-removal.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0609-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0609-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 2cd406fbc0..7a31528cdd 100644
--- a/patches/server/0609-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0609-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 de154106419d57a6b6c410fedc29cec1dbe532de..3c947dc0aea06d66a00aeca51355ea41e8d98f88 100644
+index dba04a8de93b9afe8b51e473de9e1d485c93987e..a473993ea48afd05a884e3ffcbdd15abe74580d2 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2245,6 +2245,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2247,6 +2247,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