删除交互实体

MineSunshineone · MineSunshineone · commit 4b68b00f1381 · 2025-01-19T21:31:19.000+08:00
diff --git a/src/main/java/ict/minesunshineone/landmark/listener/PlayerListener.java b/src/main/java/ict/minesunshineone/landmark/listener/PlayerListener.java
@@ -10,15 +10,12 @@
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Interaction;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -305,26 +302,6 @@ public void onPlayerInteract(PlayerInteractEvent event) {
         }
     }
 
-    @EventHandler
-    public void onPlayerInteractAtEntity(PlayerInteractAtEntityEvent event) {
-        Entity entity = event.getRightClicked();
-        if (!(entity instanceof Interaction)) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-
-        // 检查是否是锚点交互实体
-        for (Landmark landmark : plugin.getLandmarkManager().getLandmarks().values()) {
-            if (landmark.getInteractionEntityId() != null
-                    && landmark.getInteractionEntityId().equals(entity.getUniqueId())) {
-                event.setCancelled(true);
-                new LandmarkMenu(plugin, player).open();
-                break;
-            }
-        }
-    }
-
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         UUID playerId = event.getPlayer().getUniqueId();
diff --git a/src/main/java/ict/minesunshineone/landmark/manager/LandmarkManager.java b/src/main/java/ict/minesunshineone/landmark/manager/LandmarkManager.java
@@ -10,17 +10,14 @@
 import java.util.Set;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Interaction;
 import org.bukkit.entity.Player;
 
 import ict.minesunshineone.landmark.LandmarkPlugin;
 import ict.minesunshineone.landmark.model.Landmark;
-import net.kyori.adventure.text.Component;
 
 public class LandmarkManager {
 
@@ -55,9 +52,6 @@ public void createLandmark(String name, Location location, String description) {
             Landmark landmark = new Landmark(name, location, description, menuPosition[0], menuPosition[1]);
             landmarks.put(name.toLowerCase(), landmark);
 
-            // 使用统一的方法创建实体
-            createLandmarkEntities(landmark);
-
             plugin.getSLF4JLogger().info("成功创建锚点展示实体: {}", name);
             saveData();
         } catch (IllegalArgumentException | IllegalStateException e) {
@@ -107,25 +101,6 @@ public void deleteLandmark(String name) {
         String lowerName = name.toLowerCase();
         Landmark landmark = landmarks.get(lowerName);
         if (landmark != null) {
-            // 移除交互实体
-            if (landmark.getInteractionEntityId() != null) {
-                Location loc = landmark.getLocation();
-                if (loc != null && loc.getWorld() != null) {
-                    // 移除交互实体
-                    Entity entity = Bukkit.getEntity(landmark.getInteractionEntityId());
-                    if (entity != null) {
-                        entity.remove();
-                    }
-
-                    // 移除同位置的所有具有相同名称的交互实体
-                    loc.getWorld().getNearbyEntities(loc, 2, 2, 2).stream()
-                            .filter(e -> e instanceof Interaction)
-                            .filter(e -> e.customName() != null && e.customName().equals(Component.text("§e[点击打开]")))
-                            .forEach(Entity::remove);
-                }
-                landmark.setInteractionEntityId(null);
-            }
-
             // 移除锚点数据
             landmarks.remove(lowerName);
 
@@ -254,19 +229,7 @@ public final void loadData() {
                                 int menuColumn = landmarkSection.getInt("menu_column", 1);
 
                                 Landmark landmark = new Landmark(key, location, description, menuRow, menuColumn);
-                                String interactionId = landmarkSection.getString("interaction_entity_id");
-                                if (interactionId != null) {
-                                    landmark.setInteractionEntityId(UUID.fromString(interactionId));
-                                }
-
                                 landmarks.put(key.toLowerCase(), landmark);
-
-                                // 延迟创建实体，确保世界加载完成
-                                plugin.getServer().getRegionScheduler().runDelayed(plugin, location, task -> {
-                                    if (location.getWorld() != null && location.getChunk().isLoaded()) {
-                                        createLandmarkEntities(landmark);
-                                    }
-                                }, 100L);
                             }
                         } catch (IllegalArgumentException | IllegalStateException e) {
                             plugin.getSLF4JLogger().error("加载锚点 {} 时发生错误: {}", key, e.getMessage());
@@ -308,8 +271,6 @@ public void saveData() {
             Landmark landmark = entry.getValue();
             landmarkSection.set("location", landmark.getLocation());
             landmarkSection.set("description", landmark.getDescription());
-            landmarkSection.set("interaction_entity_id", landmark.getInteractionEntityId() != null
-                    ? landmark.getInteractionEntityId().toString() : null);
             landmarkSection.set("menu_row", landmark.getMenuRow());
             landmarkSection.set("menu_column", landmark.getMenuColumn());
         }
@@ -428,68 +389,13 @@ public boolean isPlayerNearLandmark(Player player, Location landmarkLoc) {
                 && playerLoc.distance(landmarkLoc) <= plugin.getConfigManager().getUnlockRadius();
     }
 
-    private void createLandmarkEntities(Landmark landmark) {
-        try {
-            Location location = landmark.getLocation();
-            if (location.getWorld() == null || !location.getChunk().isLoaded()) {
-                return;
-            }
-
-            // 确保位置是方块中心
-            Location centerLoc = location.clone();
-            centerLoc.setX(location.getBlockX() + 0.5);
-            centerLoc.setY(location.getBlockY());
-            centerLoc.setZ(location.getBlockZ() + 0.5);
-
-            // 创建交互实体
-            Location interactLoc = centerLoc.clone().add(0, 0, 0);
-            Interaction interaction = location.getWorld().spawn(interactLoc, Interaction.class, entity -> {
-                entity.setInteractionWidth(3.5f);
-                entity.setInteractionHeight(2.0f);
-                entity.setPersistent(true);
-                entity.setInvulnerable(true);
-                entity.setCustomNameVisible(true);
-                entity.customName(Component.text("§e[点击打开]"));
-                entity.setGravity(false);
-            });
-
-            landmark.setInteractionEntityId(interaction.getUniqueId());
-            saveData(); // 保存实体ID
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            plugin.getSLF4JLogger().error("重建锚点实体时发生错误: {}", e.getMessage());
-        }
-    }
-
     public void cleanup() {
-        // 清理所有实体
-        for (Landmark landmark : landmarks.values()) {
-            removeLandmarkEntities(landmark);
-        }
-
         // 清理数据结构
         landmarks.clear();
         unlockedLandmarks.clear();
         cooldowns.clear();
     }
 
-    private void removeLandmarkEntities(Landmark landmark) {
-        if (landmark.getDisplayEntityId() != null) {
-            Entity entity = Bukkit.getEntity(landmark.getDisplayEntityId());
-            if (entity != null) {
-                entity.remove();
-            }
-            landmark.setDisplayEntityId(null);
-        }
-
-        if (landmark.getInteractionEntityId() != null) {
-            Entity entity = Bukkit.getEntity(landmark.getInteractionEntityId());
-            if (entity != null) {
-                entity.remove();
-            }
-            landmark.setInteractionEntityId(null);
-        }
-    }
-
     public void updateMenuPosition(String landmarkName, int newRow, int newColumn) {
         Landmark landmark = landmarks.get(landmarkName.toLowerCase());
         if (landmark != null) {
diff --git a/src/main/java/ict/minesunshineone/landmark/model/Landmark.java b/src/main/java/ict/minesunshineone/landmark/model/Landmark.java
@@ -10,7 +10,6 @@ public class Landmark {
     private Location location;
     private String description;
     private UUID displayEntityId;
-    private UUID interactionEntityId;
     private int menuRow;    // 在菜单中的行位置
     private int menuColumn; // 在菜单中的列位置
 
@@ -62,14 +61,6 @@ public void setDisplayEntityId(UUID displayEntityId) {
         this.displayEntityId = displayEntityId;
     }
 
-    public UUID getInteractionEntityId() {
-        return interactionEntityId;
-    }
-
-    public void setInteractionEntityId(UUID interactionEntityId) {
-        this.interactionEntityId = interactionEntityId;
-    }
-
     public int getMenuRow() {
         return menuRow;
     }
