2023-08-25 01:53:02 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Wed, 23 Aug 2023 13:22:09 -0700
|
|
|
|
Subject: [PATCH] Fix inventory desync
|
|
|
|
|
|
|
|
|
2024-04-20 05:23:32 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
|
|
|
index d1833dcc92b1570e62a1941bbea6d66ff0b2ee5f..5da7ffee71bf6d82a53b3c2f99e2bd898d0b1799 100644
|
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
|
|
|
@@ -1336,6 +1336,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
|
|
|
|
// CraftBukkit start - fire PlayerLeashEntityEvent
|
|
|
|
if (CraftEventFactory.callPlayerLeashEntityEvent(this, player, player, hand).isCancelled()) {
|
|
|
|
((ServerPlayer) player).connection.send(new ClientboundSetEntityLinkPacket(this, this.getLeashHolder()));
|
|
|
|
+ player.containerMenu.sendAllDataToRemote(); // Paper - Fix inventory desync
|
|
|
|
return InteractionResult.PASS;
|
|
|
|
}
|
|
|
|
// CraftBukkit end
|
2023-08-25 01:53:02 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
|
2024-01-21 19:37:09 +01:00
|
|
|
index e258e5915b286f1117bc1413dfd3d2a5c4655380..8d2c0accadaf0c5d28e7db6e62a05f6c619cf02f 100644
|
2023-08-25 01:53:02 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
|
|
|
|
@@ -116,7 +116,7 @@ public class BlockItem extends Item {
|
|
|
|
if (placeEvent != null && (placeEvent.isCancelled() || !placeEvent.canBuild())) {
|
|
|
|
blockstate.update(true, false);
|
|
|
|
|
|
|
|
- if (this instanceof SolidBucketItem) {
|
|
|
|
+ if (true) { // Paper - if the event is called here, the inventory should be updated
|
|
|
|
((ServerPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
|
|
|
|
}
|
2023-12-03 04:41:35 +01:00
|
|
|
return InteractionResult.FAIL;
|