From fb203b8716dbf3dbabaf62db3cd8f7d5079be38e Mon Sep 17 00:00:00 2001 From: jhqwqmc <2110242767@qq.com> Date: Tue, 1 Apr 2025 09:14:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(furniture):=20=E4=BF=AE=E5=A4=8D=E5=AE=B6?= =?UTF-8?q?=E5=85=B7=E4=BA=92=E5=8A=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bukkit/entity/furniture/BukkitFurnitureManager.java | 1 - .../bukkit/entity/furniture/LoadedFurniture.java | 6 ------ 2 files changed, 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 de45c5ed7..77e8964d3 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 @@ -360,7 +360,6 @@ public class BukkitFurnitureManager implements FurnitureManager { try { int collisionEntityId = (int) Reflections.method$Entity$getId.invoke(collisionEntity); this.furnitureByCollisionEntitiesId.put(collisionEntityId, loadedFurniture); - this.furnitureByEntityId.put(collisionEntityId, loadedFurniture); } catch (IllegalAccessException | InvocationTargetException e) { throw new RuntimeException(e); } 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 36b7e93c6..7f2f9c3e0 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 @@ -99,7 +99,6 @@ public class LoadedFurniture { } for (HitBox hitBox : placement.hitBoxes()) { int[] ids = hitBox.acquireEntityIds(Reflections.instance$Entity$ENTITY_COUNTER::incrementAndGet); - int lastEntityId = -1; for (int entityId : ids) { fakeEntityIds.add(entityId); mainEntityIds.add(entityId); @@ -110,11 +109,6 @@ public class LoadedFurniture { } }); this.hitBoxes.put(entityId, hitBox); - lastEntityId = entityId; - } - // 预测添加一个CollisionEntity - if (lastEntityId != -1) { - this.hitBoxes.put(lastEntityId + 1, hitBox); } } try {