core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0292-Refresh-player-invento...

33 lines
1.4 KiB
Diff
Raw Normal View History

Explictly reset chat format in vanilla scoreboard display (fixes #1263) Vanilla now uses chat components for scoreboards, thus no longer returns a string which also resets the chat the chat format, add this back ourselves.
2018-07-25 08:58:03 +00:00
From 856d2898d092f8955c5403ef95c88dcfa07e8d28 Mon Sep 17 00:00:00 2001
Refresh player inventory when cancelling PlayerInteractEntityEvent (#1205) 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.
2018-07-13 20:52:34 +00:00
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
Explictly reset chat format in vanilla scoreboard display (fixes #1263) Vanilla now uses chat components for scoreboards, thus no longer returns a string which also resets the chat the chat format, add this back ourselves.
2018-07-25 08:58:03 +00:00
index 5ffc4fccd0..a405cc0a2a 100644
Refresh player inventory when cancelling PlayerInteractEntityEvent (#1205) 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.
2018-07-13 20:52:34 +00:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
Explictly reset chat format in vanilla scoreboard display (fixes #1263) Vanilla now uses chat components for scoreboards, thus no longer returns a string which also resets the chat the chat format, add this back ourselves.
2018-07-25 08:58:03 +00:00
@@ -1954,6 +1954,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
Refresh player inventory when cancelling PlayerInteractEntityEvent (#1205) 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.
2018-07-13 20:52:34 +00:00
}
if (event.isCancelled()) {
+ this.player.updateInventory(this.player.activeContainer); // Paper - Refresh player inventory
return;
}
// CraftBukkit end
--
2.18.0