30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
index 2a1ad096515247382da741fbcdc84f6d5b1001c5..ed5e13f668d09dcf56cec8c6269a5fbd93d156bd 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
@@ -2224,6 +2224,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||
|
|
}
|
||
|
|
|
||
|
|
if (event.isCancelled()) {
|
||
|
|
+ this.player.updateInventory(this.player.activeContainer); // Paper - Refresh player inventory
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|