修复bypass，新增随机模式，bossbar指示条

MineSunshineone · MineSunshineone · commit 698aaf07a507 · 2025-12-03T20:03:52.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ict.minesunshineone</groupId>
     <artifactId>peek</artifactId>
-    <version>3.1</version>
+    <version>3.2</version>
 
     <properties>
         <maven.compiler.release>17</maven.compiler.release>
diff --git a/src/main/java/ict/minesunshineone/peek/command/PeekCommand.java b/src/main/java/ict/minesunshineone/peek/command/PeekCommand.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Random;
 import java.util.stream.Collectors;
 
 import org.bukkit.command.Command;
@@ -51,6 +52,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                 handleDeny(player);
             case "self" ->
                 handleSelfPeek(player);
+            case "random", "r" ->
+                handleRandomPeek(player);
             default ->
                 handlePeek(player, args[0]);
         };
@@ -132,6 +135,51 @@ private boolean handleSelfPeek(Player player) {
         return true;
     }
 
+    private boolean handleRandomPeek(Player player) {
+        // 检查玩家是否已经在peek状态
+        if (plugin.getStateHandler().getActivePeeks().containsKey(player.getUniqueId())) {
+            plugin.getMessages().send(player, "already-peeking");
+            return true;
+        }
+
+        // 检查玩家是否死亡
+        if (player.isDead()) {
+            plugin.getMessages().send(player, "cannot-peek-while-dead");
+            return true;
+        }
+
+        // 检查冷却时间
+        if (plugin.getCooldownManager().isOnCooldown(player)) {
+            plugin.getMessages().send(player, "cooldown-peek", "time",
+                    String.valueOf(plugin.getCooldownManager().getRemainingCooldown(player)));
+            return true;
+        }
+
+        // 获取所有可用的目标玩家（排除自己、私密模式玩家、死亡玩家）
+        // 注意：允许 peek 正在 peek 别人的玩家
+        List<Player> availableTargets = plugin.getServer().getOnlinePlayers().stream()
+                .filter(p -> !p.equals(player)) // 排除自己
+                .filter(p -> !plugin.getPrivacyManager().isPrivateMode(p)) // 排除私密模式玩家
+                .filter(p -> !p.isDead()) // 排除死亡玩家
+                .collect(Collectors.toList());
+
+        if (availableTargets.isEmpty()) {
+            plugin.getMessages().send(player, "no-available-random-target");
+            return true;
+        }
+
+        // 随机选择一个目标
+        Random random = new Random();
+        Player target = availableTargets.get(random.nextInt(availableTargets.size()));
+
+        // 发送随机选择提示
+        plugin.getMessages().send(player, "random-peek-selected", "player", target.getName());
+
+        // 开始 peek
+        plugin.getStateHandler().startPeek(player, target);
+        return true;
+    }
+
     @Override
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         if (!(sender instanceof Player)) {
@@ -146,6 +194,8 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
             completions.add("accept");
             completions.add("deny");
             completions.add("self");
+            completions.add("random");
+            completions.add("r");
 
             if (sender.hasPermission("peek.use")) {
                 plugin.getServer().getOnlinePlayers().stream()
diff --git a/src/main/java/ict/minesunshineone/peek/handler/PeekStateHandler.java b/src/main/java/ict/minesunshineone/peek/handler/PeekStateHandler.java
@@ -5,11 +5,15 @@
 import java.util.Map;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
+import org.bukkit.boss.BarColor;
+import org.bukkit.boss.BarStyle;
+import org.bukkit.boss.BossBar;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.util.Vector;
@@ -23,6 +27,7 @@ public class PeekStateHandler {
     private final PeekPlugin plugin;
     private final Map<UUID, PeekData> activePeeks = new HashMap<>();
     private final Map<UUID, ScheduledTask> rangeCheckers = new HashMap<>();
+    private final Map<UUID, BossBar> distanceBossBars = new HashMap<>();
     private final Object rangeCheckersLock = new Object();
     private final double maxPeekDistance;
 
@@ -69,14 +74,19 @@ public void startPeek(Player peeker, Player target) {
             teleportAndSetGameMode(peeker, target);
         }
 
-        // 发送消息
-        plugin.getMessages().send(peeker, "peek-start", "player", target.getName());
-        plugin.getMessages().send(target, "being-peeked", "player", peeker.getName());
-
-        // 播放声音
-        playSound(target, "start-peek");
+        // 检查是否静默 peek（有 bypass 权限）
+        boolean silentPeek = plugin.getTargetHandler().shouldSilentPeek(peeker);
 
-        updateActionBar(target);
+        // 发送消息给观察者
+        plugin.getMessages().send(peeker, "peek-start", "player", target.getName());
+        
+        // 只有非静默模式才通知目标
+        if (!silentPeek) {
+            plugin.getMessages().send(target, "being-peeked", "player", peeker.getName());
+            // 播放声音
+            playSound(target, "start-peek");
+            updateActionBar(target);
+        }
     }
 
     public void startSelfPeek(Player peeker) {
@@ -223,18 +233,20 @@ public void endPeek(Player peeker, boolean shouldRestore) {
             
             // 检查是否是自我观察模式（target是自己）
             boolean isSelfPeek = target != null && target.getUniqueId().equals(peeker.getUniqueId());
+            // 检查是否静默 peek（有 bypass 权限）
+            boolean silentPeek = peeker.isOnline() && plugin.getTargetHandler().shouldSilentPeek(peeker);
             
-            // 只有在非自我观察模式下才给目标发送消息
-            if (target != null && target.isOnline() && !isSelfPeek) {
+            // 只有在非自我观察模式且非静默模式下才给目标发送消息
+            if (target != null && target.isOnline() && !isSelfPeek && !silentPeek) {
                 plugin.getMessages().send(target, "peek-end-target", "player", peeker.getName());
                 playSound(target, "end-peek");
             }
 
             // 最后才移除活动peek
             activePeeks.remove(peeker.getUniqueId());
 
-            // 更新目标玩家的actionbar（自我观察时不需要更新）
-            if (target != null && target.isOnline() && !isSelfPeek) {
+            // 更新目标玩家的actionbar（自我观察时不需要更新，静默模式也不更新）
+            if (target != null && target.isOnline() && !isSelfPeek && !silentPeek) {
                 updateActionBar(target);
             }
         }
@@ -271,7 +283,11 @@ private void teleportAndSetGameMode(Player peeker, Player target) {
                             plugin.getMessages().send(peeker, "teleport-failed");
                             endPeek(peeker);
                         } else {
-                            startRangeChecker(peeker, target);
+                            // 传送成功后，使用玩家的实体调度器确保在正确线程执行
+                            peeker.getScheduler().run(plugin, scheduledTask -> {
+                                startRangeChecker(peeker, target);
+                                createDistanceBossBar(peeker, target);
+                            }, null);
                         }
                     });
                 }, 2L); // 2 tick 延迟
@@ -432,6 +448,7 @@ private void startRangeChecker(Player peeker, Player target) {
 
                             if (peeker.getWorld().equals(target.getWorld())) {
                                 double distance = peeker.getLocation().distance(target.getLocation());
+                                updateDistanceBossBar(peeker, distance);
                                 if (distance > maxPeekDistance) {
                                     plugin.getMessages().send(peeker, "range-exceeded");
                                     endPeek(peeker);
@@ -459,6 +476,12 @@ public void stopRangeChecker(Player peeker) {
                 task.cancel();
             }
         }
+        // 使用玩家的实体调度器确保在正确的线程上移除 BossBar
+        if (peeker.isOnline()) {
+            peeker.getScheduler().run(plugin, scheduledTask -> removeDistanceBossBar(peeker), null);
+        } else {
+            removeDistanceBossBar(peeker);
+        }
     }
 
     public void cleanup() {
@@ -468,6 +491,58 @@ public void cleanup() {
                 rangeCheckers.remove(peeker);
             });
         }
+        // 清理所有 BossBar
+        new HashMap<>(distanceBossBars).forEach((uuid, bar) -> {
+            bar.removeAll();
+            distanceBossBars.remove(uuid);
+        });
+    }
+
+    private void createDistanceBossBar(Player peeker, Player target) {
+        removeDistanceBossBar(peeker); // 确保没有残留
+        BossBar bar = Bukkit.createBossBar(
+                String.format("§d距离 §f%s§d: §e0.0 §7/ §e%.1f §d格", target.getName(), maxPeekDistance),
+                BarColor.PINK,
+                BarStyle.SEGMENTED_10
+        );
+        bar.setProgress(0.0);
+        bar.addPlayer(peeker);
+        distanceBossBars.put(peeker.getUniqueId(), bar);
+        logDebug("Created BossBar for player %s, target: %s", peeker.getName(), target.getName());
+    }
+
+    private void updateDistanceBossBar(Player peeker, double distance) {
+        BossBar bar = distanceBossBars.get(peeker.getUniqueId());
+        if (bar == null) return;
+
+        PeekData data = activePeeks.get(peeker.getUniqueId());
+        if (data == null) return;
+
+        Player target = plugin.getServer().getPlayer(data.getTargetUUID());
+        String targetName = target != null ? target.getName() : "未知";
+
+        double progress = Math.min(distance / maxPeekDistance, 1.0);
+        bar.setProgress(progress);
+
+        // 根据距离比例改变颜色
+        if (progress < 0.5) {
+            bar.setColor(BarColor.GREEN);
+        } else if (progress < 0.75) {
+            bar.setColor(BarColor.YELLOW);
+        } else if (progress < 0.9) {
+            bar.setColor(BarColor.RED);
+        } else {
+            bar.setColor(BarColor.RED);
+        }
+
+        bar.setTitle(String.format("§d距离 §f%s§d: §e%.1f §7/ §e%.1f §d格", targetName, distance, maxPeekDistance));
+    }
+
+    private void removeDistanceBossBar(Player peeker) {
+        BossBar bar = distanceBossBars.remove(peeker.getUniqueId());
+        if (bar != null) {
+            bar.removeAll();
+        }
     }
 
     public void removeActivePeek(Player player) {
diff --git a/src/main/java/ict/minesunshineone/peek/handler/PeekTargetHandler.java b/src/main/java/ict/minesunshineone/peek/handler/PeekTargetHandler.java
@@ -36,11 +36,20 @@ public boolean canPeek(Player peeker, String targetName) {
             return false;
         }
 
-        if (plugin.getPrivacyManager().isPrivateMode(target)) {
+        // 检查隐私模式，但有 bypass 权限的玩家可以无视
+        if (plugin.getPrivacyManager().isPrivateMode(target) && !peeker.hasPermission("peek.bypass")) {
             plugin.getPrivacyManager().sendPeekRequest(peeker, target);
             return false;
         }
 
         return true;
     }
+
+    /**
+     * 检查是否应该静默 peek（不通知目标）
+     * 用于有 bypass 权限的玩家
+     */
+    public boolean shouldSilentPeek(Player peeker) {
+        return peeker.hasPermission("peek.bypass");
+    }
 }
diff --git a/src/main/resources/lang/en_US.yml b/src/main/resources/lang/en_US.yml
@@ -4,7 +4,7 @@ messages:
   prefix: ""
   command-player-only: "  &dThis feature can only be used by players!"
   no-permission: "  &dSorry, but you don't have permission to do this!"
-  usage: "  &dGuidance: \n&d➤ &f/peek <player> &7Peek player\n&d➤ &f/peek self &7Enable spectator mode in place\n&d➤ &f/peek exit &7Exit Peek Mode\n&d➤ &f/peek stats &7Get the statistics\n&d➤ &f/peek privacy &7Turn on/off Privacy Mode\n&d➤ &f/peek accept &7Accept Peek request(s)\n&d➤ &f/peek deny &7Deny Peek request(s)"
+  usage: "  &dGuidance: \n&d➤ &f/peek <player> &7Peek player\n&d➤ &f/peek random &7Randomly peek a player\n&d➤ &f/peek self &7Enable spectator mode in place\n&d➤ &f/peek exit &7Exit Peek Mode\n&d➤ &f/peek stats &7Get the statistics\n&d➤ &f/peek privacy &7Turn on/off Privacy Mode\n&d➤ &f/peek accept &7Accept Peek request(s)\n&d➤ &f/peek deny &7Deny Peek request(s)"
   already-peeking: "  &dYou're already peeking someone else，Type &f/peek exit &dto exit."
   player-not-found: "  &dCan't find the player &f{player} &d, Is there a typo in the name?"
   cannot-peek-self: "  &dYou can't peek yourself!"
@@ -47,4 +47,6 @@ messages:
   peek-end-respawn: "&aYou have respawned, your peek state has been restored~"
   self-peek-start: "  &d✨ Self-peek mode activated! You can now explore freely, remember to use &f/peek exit &dto exit spectator mode~"
   self-peek-range-exceeded: "  &dYou are too far from your original position, self-peek mode has been automatically ended~"
-  self-peek-world-changed: "  &dDetected world change, self-peek mode has been automatically ended~"
+  self-peek-world-changed: "  &dDetected world change, self-peek mode has been automatically ended~"
+  random-peek-selected: "  &d✨ Randomly selected &f{player}&d, starting peek~"
+  no-available-random-target: "  &dNo available players to randomly peek, everyone is in privacy mode or offline~"
diff --git a/src/main/resources/lang/zh_CN.yml b/src/main/resources/lang/zh_CN.yml
@@ -2,7 +2,7 @@ messages:
   prefix: ""
   command-player-only: "  &d这个魔法只能由玩家施展哦~"
   no-permission: "  &d抱歉，你还没有获得使用这个魔法的权限呢~"
-  usage: "  &d施法指南：\n&d➤ &f/peek <玩家名> &7贴贴指定玩家\n&d➤ &f/peek self &7在原地开启观察者模式\n&d➤ &f/peek exit &7退出贴贴模式\n&d➤ &f/peek stats &7查看贴贴统计\n&d➤ &f/peek privacy &7切换私人模式\n&d➤ &f/peek accept &7接受贴贴请求\n&d➤ &f/peek deny &7拒绝贴贴请求"
+  usage: "  &d施法指南：\n&d➤ &f/peek <玩家名> &7贴贴指定玩家\n&d➤ &f/peek random &7随机贴贴一个玩家\n&d➤ &f/peek self &7在原地开启观察者模式\n&d➤ &f/peek exit &7退出贴贴模式\n&d➤ &f/peek stats &7查看贴贴统计\n&d➤ &f/peek privacy &7切换私人模式\n&d➤ &f/peek accept &7接受贴贴请求\n&d➤ &f/peek deny &7拒绝贴贴请求"
   already-peeking: "  &d你已经在贴贴别人了呢，输入 &f/peek exit &d解除魔法吧~"
   player-not-found: "  &d咦？找不到玩家 &f{player} &d呢，是不是拼错名字啦？"
   cannot-peek-self: "  &d自己贴贴自己？这可不行呢，试试贴贴别人吧！"
@@ -45,4 +45,6 @@ messages:
   peek-end-respawn: "&a你已重生，贴贴状态已恢复~"
   self-peek-start: "  &d✨ 自我观察模式已启动！你现在可以自由探索，记得用 &f/peek exit &d退出观察模式~"
   self-peek-range-exceeded: "  &d你离原位置太远了，自我观察模式已自动结束~"
-  self-peek-world-changed: "  &d检测到你切换了世界，自我观察模式已自动结束~"
+  self-peek-world-changed: "  &d检测到你切换了世界，自我观察模式已自动结束~"
+  random-peek-selected: "  &d✨ 随机选中了 &f{player}&d，正在施展贴贴魔法~"
+  no-available-random-target: "  &d当前没有可以随机贴贴的玩家呢，大家都在私密模式或者不在线~"

Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,20 @@ public boolean canPeek(Player peeker, String targetName) {`
`36`	`36`	`return false;`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (plugin.getPrivacyManager().isPrivateMode(target)) {`
	`39`	`+ // 检查隐私模式，但有 bypass 权限的玩家可以无视`
	`40`	`+ if (plugin.getPrivacyManager().isPrivateMode(target) && !peeker.hasPermission("peek.bypass")) {`
`40`	`41`	`plugin.getPrivacyManager().sendPeekRequest(peeker, target);`
`41`	`42`	`return false;`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`return true;`
`45`	`46`	`}`
	`47`	`+`
	`48`	`+ /**`
	`49`	`+ * 检查是否应该静默 peek（不通知目标）`
	`50`	`+ * 用于有 bypass 权限的玩家`
	`51`	`+ */`
	`52`	`+ public boolean shouldSilentPeek(Player peeker) {`
	`53`	`+ return peeker.hasPermission("peek.bypass");`
	`54`	`+ }`
`46`	`55`	`}`