From da5c6ad5c2b1b8550766f9178bc89625fea178e1 Mon Sep 17 00:00:00 2001
From: jhqwqmc <2110242767@qq.com>
Date: Sat, 7 Jun 2025 14:48:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(bukkit):=20=E5=A2=9E=E5=BC=BA=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BB=A5=E5=85=8D=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/network/handler/CommonItemPacketHandler.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/handler/CommonItemPacketHandler.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/handler/CommonItemPacketHandler.java
index 52359827c..a51598259 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/handler/CommonItemPacketHandler.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/handler/CommonItemPacketHandler.java
@@ -2,8 +2,10 @@ package net.momirealms.craftengine.bukkit.plugin.network.handler;
 
 import net.momirealms.craftengine.bukkit.item.BukkitItemManager;
 import net.momirealms.craftengine.bukkit.nms.FastNMS;
+import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.CoreReflections;
 import net.momirealms.craftengine.bukkit.plugin.user.BukkitServerPlayer;
 import net.momirealms.craftengine.bukkit.util.EntityDataUtils;
+import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.plugin.network.ByteBufPacketEvent;
 import net.momirealms.craftengine.core.plugin.network.EntityPacketHandler;
 import net.momirealms.craftengine.core.plugin.network.NetWorkUser;
@@ -27,6 +29,10 @@ public class CommonItemPacketHandler implements EntityPacketHandler {
             int entityDataId = FastNMS.INSTANCE.field$SynchedEntityData$DataValue$id(packedItem);
             if (entityDataId == EntityDataUtils.ITEM_DATA_ID) {
                 Object nmsItemStack = FastNMS.INSTANCE.field$SynchedEntityData$DataValue$value(packedItem);
+                if (!CoreReflections.clazz$ItemStack.isInstance(nmsItemStack)) {
+                    CraftEngine.instance().logger().warn("Invalid item data for entity " + id);
+                    continue;
+                }
                 ItemStack itemStack = FastNMS.INSTANCE.method$CraftItemStack$asCraftMirror(nmsItemStack);
                 Optional<ItemStack> optional = BukkitItemManager.instance().s2c(itemStack, (BukkitServerPlayer) user);
                 if (optional.isPresent()) {