2021-06-11 14:02:28 +02:00
|
|
|
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/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2022-03-01 04:25:13 +01:00
|
|
|
index b280cb3250928367efa02cd1d9ce1607e6fb547d..dced761b1f74de28a784dfcffed1bbc002e5a586 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2022-03-01 06:43:03 +01:00
|
|
|
@@ -2234,6 +2234,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
2021-06-12 23:31:35 +02:00
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-06-12 23:31:35 +02:00
|
|
|
if (event.isCancelled()) {
|
|
|
|
+ ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - Refresh player inventory
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// CraftBukkit end
|