From caeeab641b3733f1a749123be0fc8a1dcc9a6fa3 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Tue, 8 Apr 2025 03:30:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dworldedit=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bukkit/entity/furniture/BukkitFurnitureManager.java    | 3 ++-
 .../bukkit/entity/furniture/FurnitureEventListener.java    | 2 +-
 .../bukkit/plugin/command/feature/TestCommand.java         | 7 ++++---
 gradle.properties                                          | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
index 0c970796b..9fd2c4f8f 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
@@ -323,8 +323,9 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
         if (FastNMS.INSTANCE.method$CraftEntity$getHandle(shulker) instanceof CollisionEntity) {
             return;
         }
+        // not a collision entity
         Byte flag = shulker.getPersistentDataContainer().get(FURNITURE_COLLISION, PersistentDataType.BYTE);
-        if (flag != null && flag == 1) {
+        if (flag == null || flag != 1) {
             return;
         }
 
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/FurnitureEventListener.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/FurnitureEventListener.java
index 23b69487d..18bfa8e42 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/FurnitureEventListener.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/FurnitureEventListener.java
@@ -55,7 +55,7 @@ public class FurnitureEventListener implements Listener {
         if (entity instanceof ItemDisplay itemDisplay) {
             this.manager.handleBaseEntityLoadLate(itemDisplay, 0);
         } else if (entity instanceof Shulker shulker) {
-            //this.manager.handleCollisionEntityLoadLate(shulker, 0);
+            this.manager.handleCollisionEntityLoadLate(shulker, 0);
         }
     }
 
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/TestCommand.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/TestCommand.java
index f7aa65dbe..0b7a822c2 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/TestCommand.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/TestCommand.java
@@ -1,7 +1,6 @@
 package net.momirealms.craftengine.bukkit.plugin.command.feature;
 
-import net.momirealms.craftengine.bukkit.nms.CollisionEntity;
-import net.momirealms.craftengine.bukkit.nms.FastNMS;
+import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
 import net.momirealms.craftengine.bukkit.plugin.command.BukkitCommandFeature;
 import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.plugin.command.CraftEngineCommandManager;
@@ -9,6 +8,8 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Shulker;
+import org.bukkit.persistence.PersistentDataType;
 import org.incendo.cloud.Command;
 
 import java.util.Collection;
@@ -29,7 +30,7 @@ public class TestCommand extends BukkitCommandFeature<CommandSender> {
                     try {
                         Collection<Entity> entities = player.getLocation().getNearbyEntities(2,2,2);
                         for (Entity entity : entities) {
-                            if (FastNMS.INSTANCE.method$CraftEntity$getHandle(entity) instanceof CollisionEntity) {
+                            if (entity instanceof Shulker) {
                             }
                         }
                     } catch (Exception e) {
diff --git a/gradle.properties b/gradle.properties
index 5f0e31ca5..6db3d7e84 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 # Project settings
 # Rule: [major update].[feature update].[bug fix]
 project_version=0.0.46
-config_version=22
+config_version=23
 lang_version=4
 project_group=net.momirealms
 latest_supported_version=1.21.5
@@ -51,7 +51,7 @@ byte_buddy_version=1.17.5
 ahocorasick_version=0.6.3
 snake_yaml_version=2.4
 anti_grief_version=0.13
-nms_helper_version=0.44.2
+nms_helper_version=0.45
 # Ignite Dependencies
 mixinextras_version=0.4.1
 mixin_version=0.15.2+mixin.0.8.7