Paper-Old/Spigot-Server-Patches/0291-Refresh-player-inventory-when-cancelling-PlayerInter.patch

From f1b5e30bf792b0fcaae09cd0a6c22a3e51188e76 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
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 da501a1c5f..f7401f5c98 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1954,6 +1954,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                     }
 
                     if (event.isCancelled()) {
+                        this.player.updateInventory(this.player.activeContainer); // Paper - Refresh player inventory
                         return;
                     }
                     // CraftBukkit end
-- 
2.18.0
[Auto] Update Upstream Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types 2018-08-06 01:46:43 +02:00			`From f1b5e30bf792b0fcaae09cd0a6c22a3e51188e76 Mon Sep 17 00:00:00 2001`
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. 2018-07-13 22:52:34 +02:00			`From: Minecrell <minecrell@minecrell.net>`
			`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`
[Auto] Update Upstream Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types 2018-08-06 01:46:43 +02:00			`index da501a1c5f..f7401f5c98 100644`
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. 2018-07-13 22:52:34 +02:00			`--- a/src/main/java/net/minecraft/server/PlayerConnection.java`
			`+++ b/src/main/java/net/minecraft/server/PlayerConnection.java`
Explictly reset chat format in vanilla scoreboard display (fixes #1263) Vanilla now uses chat components for scoreboards, thus no longer returns a string which also resets the chat the chat format, add this back ourselves. 2018-07-25 10:58:03 +02:00			`@@ -1954,6 +1954,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {`
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. 2018-07-13 22:52:34 +02:00			`}`

			`if (event.isCancelled()) {`
			`+ this.player.updateInventory(this.player.activeContainer); // Paper - Refresh player inventory`
			`return;`
			`}`
			`// CraftBukkit end`
			`--`
			`2.18.0`