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

33 lines
1.4 KiB
Diff
Raw Normal View History

2019-07-20 06:01:24 +02:00
From 444c84a9b153f9b5cfc94e21175a881a9c84d6c4 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
2019-07-20 06:01:24 +02:00
index b9793d4cc6..f2de19b9b4 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-07-20 06:01:24 +02:00
@@ -1939,6 +1939,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (event.isCancelled()) {
+ this.player.updateInventory(this.player.activeContainer); // Paper - Refresh player inventory
return;
}
// CraftBukkit end
--
2.22.0