From 04588340dafec19978497c9765cf1585133743b9 Mon Sep 17 00:00:00 2001
From: jhqwqmc <2110242767@qq.com>
Date: Tue, 15 Jul 2025 15:21:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(bukkit):=20=E4=BF=AE=E5=A4=8D=E7=96=8F?=
 =?UTF-8?q?=E5=BF=BD=E5=86=99=E9=94=99=E7=9A=84=E5=87=A0=E4=B8=AA=E5=9C=B0?=
 =?UTF-8?q?=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bukkit/plugin/network/PacketConsumers.java            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
index 02dd5c16e..519082a7b 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
@@ -2246,13 +2246,13 @@ public class PacketConsumers {
                     int k = buf.readShort();
                     Object hashedStack = FastNMS.INSTANCE.method$StreamDecoder$decode(NetworkReflections.instance$HashedStack$STREAM_CODEC, friendlyBuf);
                     Object serverSideItemStack = FastNMS.INSTANCE.method$Container$getItem(inventory, k);
-                    Optional<ItemStack> optional = BukkitItemManager.instance().s2c(FastNMS.INSTANCE.method$CraftItemStack$asCraftMirror(serverSideItemStack), ((net.momirealms.craftengine.core.entity.player.Player) user));
+                    Optional<ItemStack> optional = BukkitItemManager.instance().s2c(FastNMS.INSTANCE.method$CraftItemStack$asCraftMirror(serverSideItemStack).clone(), ((net.momirealms.craftengine.core.entity.player.Player) user));
                     if (optional.isPresent()) {
                         Object clientSideItemStack = FastNMS.INSTANCE.field$CraftItemStack$handle(optional.get());
                         boolean isSync = FastNMS.INSTANCE.method$HashedStack$matches(hashedStack, clientSideItemStack, BukkitItemManager.instance().decoratedHashOpsGenerator());
                         if (isSync) {
                             changed = true;
-                            hashedStack = FastNMS.INSTANCE.method$HashedStack$create(clientSideItemStack, null);
+                            hashedStack = FastNMS.INSTANCE.method$HashedStack$create(serverSideItemStack, null);
                         }
                     }
                     changedSlots.put(k, hashedStack);
@@ -2260,13 +2260,13 @@ public class PacketConsumers {
                 Object carriedHashedStack = FastNMS.INSTANCE.method$StreamDecoder$decode(NetworkReflections.instance$HashedStack$STREAM_CODEC, friendlyBuf);
                 Object containerMenu = FastNMS.INSTANCE.field$Player$containerMenu(user.serverPlayer());
                 Object serverSideCarriedItemStack = FastNMS.INSTANCE.method$AbstractContainerMenu$getCarried(containerMenu);
-                Optional<ItemStack> optional = BukkitItemManager.instance().s2c(FastNMS.INSTANCE.method$CraftItemStack$asCraftMirror(serverSideCarriedItemStack), ((net.momirealms.craftengine.core.entity.player.Player) user));
+                Optional<ItemStack> optional = BukkitItemManager.instance().s2c(FastNMS.INSTANCE.method$CraftItemStack$asCraftMirror(serverSideCarriedItemStack).clone(), ((net.momirealms.craftengine.core.entity.player.Player) user));
                 if (optional.isPresent()) {
                     Object clientSideCarriedItemStack = FastNMS.INSTANCE.field$CraftItemStack$handle(optional.get());
                     boolean isSync = FastNMS.INSTANCE.method$HashedStack$matches(carriedHashedStack, clientSideCarriedItemStack, BukkitItemManager.instance().decoratedHashOpsGenerator());
                     if (isSync) {
                         changed = true;
-                        carriedHashedStack = FastNMS.INSTANCE.method$HashedStack$create(clientSideCarriedItemStack, BukkitItemManager.instance().decoratedHashOpsGenerator());
+                        carriedHashedStack = FastNMS.INSTANCE.method$HashedStack$create(serverSideCarriedItemStack, BukkitItemManager.instance().decoratedHashOpsGenerator());
                     }
                 }
                 if (changed) {