Update patches to latest 1.21.4 #1

Merged
Chaoscaot merged 242 commits from update/1.21.4 into main 2025-04-23 22:27:11 +02:00
388 changed files with 5764 additions and 2480 deletions
Showing only changes of commit f63dbeafde - Show all commits

View File

@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/HangingEntityItem.java --- a/net/minecraft/world/item/HangingEntityItem.java
+++ b/net/minecraft/world/item/HangingEntityItem.java +++ b/net/minecraft/world/item/HangingEntityItem.java
@@ -66,6 +_,19 @@ @@ -66,6 +_,20 @@
if (hangingEntity.survives()) { if (hangingEntity.survives()) {
if (!level.isClientSide) { if (!level.isClientSide) {
@ -14,6 +14,7 @@
+ level.getCraftServer().getPluginManager().callEvent(event); + level.getCraftServer().getPluginManager().callEvent(event);
+ +
+ if (event.isCancelled()) { + if (event.isCancelled()) {
+ if (player != null) player.containerMenu.sendAllDataToRemote(); // Paper - Fix inventory desync
+ return InteractionResult.FAIL; + return InteractionResult.FAIL;
+ } + }
+ // CraftBukkit end + // CraftBukkit end