mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
0fb8bdf0e0
Upstream has released updates that appear 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: 14883d6b SPIGOT-6078: Add SmithItemEvent and expand SmithingInventory API CraftBukkit Changes: 115244c7 SPIGOT-6078: Add SmithItemEvent and expand SmithingInventory API
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 5c637fc653482e931fa6d0f5d0394d0b923b5ff8..19763a27ad54866b7d1f6e2cfccd6bbe6e54637e 100644
|
|
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
|
@@ -2223,6 +2223,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
}
|
|
|
|
if (event.isCancelled()) {
|
|
+ this.player.updateInventory(this.player.activeContainer); // Paper - Refresh player inventory
|
|
return;
|
|
}
|
|
// CraftBukkit end
|