Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-25 09:59:20 +00:00
Code Issues Releases Activity

fix(furniture): 修复家具互动逻辑

Browse Source
This commit is contained in:
jhqwqmc
2025-04-01 09:02:20 +08:00
parent 8c0210d343
commit b504be805e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
View File

@@ -361,9 +361,6 @@ public class BukkitFurnitureManager implements FurnitureManager {
int collisionEntityId = (int) Reflections.method$Entity$getId.invoke(collisionEntity);
this.furnitureByCollisionEntitiesId.put(collisionEntityId, loadedFurniture);
this.furnitureByEntityId.put(collisionEntityId, loadedFurniture);
for (HitBox hitBox : loadedFurniture.placement().hitBoxes()) {
loadedFurniture.hitBoxes().put(collisionEntityId, hitBox);
}
} catch (IllegalAccessException | InvocationTargetException e) {
throw new RuntimeException(e);
}

6
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java
View File

@@ -99,6 +99,7 @@ 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);
@@ -109,6 +110,11 @@ public class LoadedFurniture {
}
});
this.hitBoxes.put(entityId, hitBox);
lastEntityId = entityId;
}
// 预测添加一个CollisionEntity
if (lastEntityId != -1) {
this.hitBoxes.put(lastEntityId + 1, hitBox);
}
}
try {

1
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
View File

@@ -690,7 +690,6 @@ public class PacketConsumers {
Object actionType = Reflections.method$ServerboundInteractPacket$Action$getType.invoke(action);
if (actionType == null) return;
LoadedFurniture furniture = BukkitFurnitureManager.instance().getLoadedFurnitureByEntityId(entityId);
player.sendMessage("Interact with " + entityId + " " + actionType + " " + furniture);
if (furniture == null) return;
Location location = furniture.baseEntity().getLocation();
BukkitServerPlayer serverPlayer = (BukkitServerPlayer) user;