From 695beffc27cddab8fadd53dcef1a6aba12566f60 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 13 Jul 2018 22:52:34 +0200 Subject: [PATCH] Refresh player inventory when cancelling PlayerInteractEntityEvent (#1205) When interacting with entities with an item, the client will assume the interaction is successful, and update the held item on the client. However, if the interaction is cancelled on the server side, the client will still mistakenly remove/replace the item in hand. Examples for this are milking cows with a bucket or dyeing sheep. The bucket is replaced with milk and the dye removed from inventory. Refresh the player inventory when PlayerInteractEntityEvent is cancelled to avoid this problem. --- ...nventory-when-cancelling-PlayerInter.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Spigot-Server-Patches/Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/Spigot-Server-Patches/Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/Refresh-player-inventory-when-cancelling-PlayerInter.patch new file mode 100644 index 0000000000..a5f973a77b --- /dev/null +++ b/Spigot-Server-Patches/Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Minecrell +Date: Fri, 13 Jul 2018 14:54:43 +0200 +Subject: [PATCH] Refresh player inventory when cancelling + PlayerInteractEntityEvent + +When interacting with entities with an item, the client will assume +the interaction is successful, and update the held item on the +client. However, if the interaction is cancelled on the server side, +the client will still mistakenly remove/replace the item in hand. + +Examples for this are milking cows with a bucket or dyeing sheep. +The bucket is replaced with milk and the dye removed from inventory. + +Refresh the player inventory when PlayerInteractEntityEvent is +cancelled to avoid this problem. + +diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java +index a54203c56..cc1152739 100644 +--- a/src/main/java/net/minecraft/server/PlayerConnection.java ++++ b/src/main/java/net/minecraft/server/PlayerConnection.java +@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { + } + + if (event.isCancelled()) { ++ this.player.updateInventory(this.player.activeContainer); // Paper - Refresh player inventory + return; + } + // CraftBukkit end +-- \ No newline at end of file