From 245f31261e0da76d34cdcc1c6073f97f3eb92e56 Mon Sep 17 00:00:00 2001
From: jhqwqmc <2110242767@qq.com>
Date: Wed, 6 Aug 2025 16:49:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(gui):=20=E4=BF=AE=E5=A4=8D=E6=9F=90?=
 =?UTF-8?q?=E4=BA=9B=20GUI=20=E7=95=8C=E9=9D=A2=E5=AF=BC=E8=87=B4=E4=B8=A5?=
 =?UTF-8?q?=E9=87=8D=E5=8D=A1=E6=9C=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../craftengine/bukkit/plugin/gui/BukkitGuiManager.java    | 7 +++++++
 .../plugin/reflection/bukkit/CraftBukkitReflections.java   | 4 ++++
 .../craftengine/bukkit/plugin/user/BukkitServerPlayer.java | 4 ++++
 gradle.properties                                          | 2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/gui/BukkitGuiManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/gui/BukkitGuiManager.java
index e6896e91f..26b31cebc 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/gui/BukkitGuiManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/gui/BukkitGuiManager.java
@@ -3,6 +3,7 @@ package net.momirealms.craftengine.bukkit.plugin.gui;
 import net.kyori.adventure.text.Component;
 import net.momirealms.craftengine.bukkit.nms.FastNMS;
 import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
+import net.momirealms.craftengine.bukkit.plugin.reflection.bukkit.CraftBukkitReflections;
 import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.CoreReflections;
 import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.NetworkReflections;
 import net.momirealms.craftengine.bukkit.util.ComponentUtils;
@@ -91,6 +92,9 @@ public class BukkitGuiManager implements GuiManager, Listener {
     @EventHandler(ignoreCancelled = true)
     public void onInventoryClick(InventoryClickEvent event) {
         org.bukkit.inventory.Inventory inventory = event.getInventory();
+        if (!CraftBukkitReflections.clazz$MinecraftInventory.isInstance(FastNMS.INSTANCE.method$CraftInventory$getInventory(inventory))) {
+            return;
+        }
         if (!(inventory.getHolder() instanceof CraftEngineInventoryHolder craftEngineInventoryHolder)) {
             return;
         }
@@ -106,6 +110,9 @@ public class BukkitGuiManager implements GuiManager, Listener {
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
     public void onInventoryDrag(InventoryDragEvent event) {
         org.bukkit.inventory.Inventory inventory = event.getInventory();
+        if (!CraftBukkitReflections.clazz$MinecraftInventory.isInstance(FastNMS.INSTANCE.method$CraftInventory$getInventory(inventory))) {
+            return;
+        }
         if (!(inventory.getHolder() instanceof CraftEngineInventoryHolder)) {
             return;
         }
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/bukkit/CraftBukkitReflections.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/bukkit/CraftBukkitReflections.java
index fa15e41c7..a216443ec 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/bukkit/CraftBukkitReflections.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/bukkit/CraftBukkitReflections.java
@@ -353,4 +353,8 @@ public final class CraftBukkitReflections {
     public static final Method method$Level$getCraftWorld = requireNonNull(
             ReflectionUtils.getMethod(CoreReflections.clazz$Level, clazz$CraftWorld)
     );
+
+    public static final Class<?> clazz$MinecraftInventory = requireNonNull(
+            ReflectionUtils.getClazz(BukkitReflectionUtils.assembleCBClass("inventory.CraftInventoryCustom$MinecraftInventory"))
+    );
 }
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
index a2c501de6..64f58fa0c 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
@@ -11,6 +11,7 @@ import net.momirealms.craftengine.bukkit.nms.FastNMS;
 import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
 import net.momirealms.craftengine.bukkit.plugin.gui.CraftEngineInventoryHolder;
 import net.momirealms.craftengine.bukkit.plugin.network.payload.DiscardedPayload;
+import net.momirealms.craftengine.bukkit.plugin.reflection.bukkit.CraftBukkitReflections;
 import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.CoreReflections;
 import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.MAttributeHolders;
 import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.MMobEffects;
@@ -456,6 +457,9 @@ public class BukkitServerPlayer extends Player {
 
     private void updateGUI() {
         org.bukkit.inventory.Inventory top = !VersionHelper.isOrAbove1_21() ? LegacyInventoryUtils.getTopInventory(platformPlayer()) : platformPlayer().getOpenInventory().getTopInventory();
+        if (!CraftBukkitReflections.clazz$MinecraftInventory.isInstance(FastNMS.INSTANCE.method$CraftInventory$getInventory(top))) {
+            return;
+        }
         if (top.getHolder() instanceof CraftEngineInventoryHolder holder) {
             holder.gui().onTimer();
         }
diff --git a/gradle.properties b/gradle.properties
index cb6c151a3..49e177021 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -50,7 +50,7 @@ byte_buddy_version=1.17.5
 ahocorasick_version=0.6.3
 snake_yaml_version=2.4
 anti_grief_version=0.18
-nms_helper_version=1.0.54
+nms_helper_version=1.0.55
 evalex_version=3.5.0
 reactive_streams_version=1.0.4
 amazon_awssdk_version=2.31.23