From 1973a37e57f3ef5fbbbc4076bf3a86b992b64ad8 Mon Sep 17 00:00:00 2001
From: jhqwqmc <2110242767@qq.com>
Date: Tue, 1 Apr 2025 06:59:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(bukkit):=20=E4=BF=AE=E5=A4=8D=E7=8E=A9?=
 =?UTF-8?q?=E5=AE=B6=E8=BD=BD=E5=85=B7=E5=9D=90=E9=AA=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../craftengine/bukkit/entity/furniture/LoadedFurniture.java | 5 -----
 .../craftengine/bukkit/plugin/network/PacketConsumers.java   | 4 ++++
 gradle.properties                                            | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java
index abd3c4cae..6d79a3080 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java
@@ -135,11 +135,6 @@ public class LoadedFurniture {
                 double z2 = z - offset2.z();
                 Object aabb = FastNMS.INSTANCE.constructor$AABB(x1, y1, z1, x2, y2, z2);
                 CollisionEntity entity = FastNMS.INSTANCE.createCollisionEntity(world, aabb, x, y, z, collider.canBeHitByProjectile());
-                fakeEntityIds.add(entity.getId());
-                mainEntityIds.add(entity.getId());
-                for (HitBox hitBox : placement.hitBoxes()) {
-                    this.hitBoxes.put(entity.getId(), hitBox);
-                }
                 FastNMS.INSTANCE.method$LevelWriter$addFreshEntity(world, entity);
                 this.collisionEntities[i] = entity;
             }
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 cd71a2638..e90e59dfb 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
@@ -12,6 +12,7 @@ import net.momirealms.craftengine.bukkit.block.BukkitBlockManager;
 import net.momirealms.craftengine.bukkit.compatibility.modelengine.ModelEngineUtils;
 import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
 import net.momirealms.craftengine.bukkit.entity.furniture.LoadedFurniture;
+import net.momirealms.craftengine.bukkit.nms.CollisionEntity;
 import net.momirealms.craftengine.bukkit.nms.FastNMS;
 import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
 import net.momirealms.craftengine.bukkit.plugin.user.BukkitServerPlayer;
@@ -625,6 +626,9 @@ public class PacketConsumers {
                         event.setCancelled(true);
                     }
                 }
+            } else if (entityType.equals(CollisionEntity.class)) {
+                // 取消服务端碰撞实体
+                event.setCancelled(true);
             }
         } catch (Exception e) {
             CraftEngine.instance().logger().warn("Failed to handle ClientboundAddEntityPacket", e);
diff --git a/gradle.properties b/gradle.properties
index 3d8f43a14..08a87bf87 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,7 +49,7 @@ mojang_brigadier_version=1.0.18
 byte_buddy_version=1.15.11
 snake_yaml_version=2.3
 anti_grief_version=0.13
-nms_helper_version=0.27
+nms_helper_version=0.26
 # Ignite Dependencies
 mixinextras_version=0.4.1
 mixin_version=0.15.2+mixin.0.8.7