Fix horse armor desync (#11341)

1 files changed, 30 insertions, 0 deletions

diff --git a/patches/server/0800-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0800-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
new file mode 100644
index 0000000000..99130d8f1a
--- /dev/null
+++ b/patches/server/0800-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 10 Oct 2021 18:18:01 -0700
+Subject: [PATCH] Fix HumanEntity#drop not updating the client inv
+
+== AT ==
+public net.minecraft.server.level.ServerPlayer containerSynchronizer
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+index 9ab3fc287480aedcb4033801d4f092719e933454..12ab8f7cde88cd6ce3ad474fe2843d5d30c3c0d7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+@@ -751,8 +751,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+     // Paper end
+     @Override
+     public boolean dropItem(boolean dropAll) {
+-        if (!(this.getHandle() instanceof ServerPlayer)) return false;
+-        return ((ServerPlayer) this.getHandle()).drop(dropAll);
++        // Paper start - Fix HumanEntity#drop not updating the client inv
++        if (!(this.getHandle() instanceof ServerPlayer player)) return false;
++        boolean success = player.drop(dropAll);
++        if (!success) return false;
++        final net.minecraft.world.entity.player.Inventory inv = player.getInventory();
++        final java.util.OptionalInt optionalSlot = player.containerMenu.findSlot(inv, inv.selected);
++        optionalSlot.ifPresent(slot -> player.containerSynchronizer.sendSlotChange(player.containerMenu, slot, inv.getSelected()));
++        return true;
++        // Paper end - Fix HumanEntity#drop not updating the client inv
+     }
+ 
+     @Override