70ad51a80c
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing My recent work on serialization is now in CraftBukkit so was able to drop the patch and Paper is now consistent with upstream. Bukkit Changes: e2699636 Move API notes to more obvious location CraftBukkit Changes: 1b2830a3 SPIGOT-4441: Fix serializing Components to and from Legacy
29 lines
1.4 KiB
Diff
29 lines
1.4 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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index eb53d8bb5c36482c39afeb6c324a620d2c7b21fb..4fb5c47fc8505c6a6e68d21a240887a0cbe10d14 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -1950,6 +1950,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
}
|
|
|
|
if (event.isCancelled()) {
|
|
+ this.player.updateInventory(this.player.activeContainer); // Paper - Refresh player inventory
|
|
return;
|
|
}
|
|
// CraftBukkit end
|