mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
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 Bukkit Changes: 30885166 Update to Minecraft 1.16.4 CraftBukkit Changes: 3af81c71 Update to Minecraft 1.16.4 Spigot Changes: f011ca24 Update to Minecraft 1.16.4 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
30 lines
1.4 KiB
Diff
30 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 bad3923c0ec5b99d4e102d61ad88321aa854350e..e025360ffdb54f91b2215076f24f9abb08d6718f 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -2074,6 +2074,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
}
|
|
|
|
if (event.isCancelled()) {
|
|
+ this.player.updateInventory(this.player.activeContainer); // Paper - Refresh player inventory
|
|
return;
|
|
}
|
|
// CraftBukkit end
|