From 3f7c8e4001251d013e4978688077859c1fb2522e Mon Sep 17 00:00:00 2001
From: youpaishidifu <youpaishidifu@outlook.com>
Date: Thu, 23 Jul 2026 00:40:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20applyPunishment=20=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8C=89=20chat.txt=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=20=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86=E5=91=98/?=
 =?UTF-8?q?=E5=85=A8=E6=9C=8D=E9=80=9A=E6=8A=A5=20=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/Sdf1_login/ChatFilterManager.java    | 40 +++++++++----------
 src/main/java/Sdf1_login/Main.java            | 26 ------------
 2 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/src/main/java/Sdf1_login/ChatFilterManager.java b/src/main/java/Sdf1_login/ChatFilterManager.java
index 1bb1757..211675b 100644
--- a/src/main/java/Sdf1_login/ChatFilterManager.java
+++ b/src/main/java/Sdf1_login/ChatFilterManager.java
@@ -1092,32 +1092,32 @@ public class ChatFilterManager {
                             }
                             break;
                     }
-                    // 非 warn → 通知在线管理员
+                    // 非 warn → 按配置通知
                     if (!"warn".equals(fType)) {
-                        String adminMsg = "§c[聊天监控] §f玩家 "
-                                + fName + " 因" + fReason
+                        String punishInfo = "玩家 " + fName
+                                + " 因" + fReason
                                 + "被" + fIssuer + "处罚："
                                 + fType;
                         if ("mute".equals(fType))
-                            adminMsg += " " + durStr;
-                        for (Player op :
-                                Bukkit.getOnlinePlayers()) {
-                            if (op.hasPermission(
-                                    "sdf1.admin")
-                                    || op.isOp()) {
-                                op.sendMessage(adminMsg);
+                            punishInfo += " " + durStr;
+                        // 通知管理员（插件 tag 管理员/OP）
+                        if (notifyAdmin) {
+                            String adminMsg = "§c[聊天监控] §f"
+                                    + punishInfo;
+                            for (Player op :
+                                    Bukkit.getOnlinePlayers()) {
+                                if (op.hasPermission(
+                                        "sdf1.admin")
+                                        || op.isOp()) {
+                                    op.sendMessage(adminMsg);
+                                }
                             }
                         }
-                    }
-                    // kick/ban/banip → 全服公告
-                    if (fType.equals("kick")
-                            || fType.equals("ban")
-                            || fType.equals("banip")) {
-                        Bukkit.broadcastMessage(
-                                "§c[公告] §f玩家 " + fName
-                                        + " 因" + fReason
-                                        + "被" + fIssuer
-                                        + "处罚");
+                        // 全服公告
+                        if (notifyAll) {
+                            Bukkit.broadcastMessage(
+                                    "§c[公告] §f" + punishInfo);
+                        }
                     }
                 });
         return type;
diff --git a/src/main/java/Sdf1_login/Main.java b/src/main/java/Sdf1_login/Main.java
index 52827bb..a96d291 100644
--- a/src/main/java/Sdf1_login/Main.java
+++ b/src/main/java/Sdf1_login/Main.java
@@ -3428,32 +3428,6 @@ public class Main extends JavaPlugin
                 "chat_url_violation",
                 "count", String.valueOf(count)));
 
-        // 通知管理员
-        if (chatFilter.isNotifyAdmin()) {
-            String notify = chatFilter.msg(
-                    "chat_url_admin_notify",
-                    "player", p.getName(),
-                    "url", blocked.get(0),
-                    "count", String.valueOf(count));
-            for (Player op :
-                    Bukkit.getOnlinePlayers()) {
-                if (op.hasPermission(
-                        "sdf1.admin")
-                        || op.isOp()) {
-                    op.sendMessage(notify);
-                }
-            }
-        }
-
-        // 通报
-        if (chatFilter.isNotifyAll()) {
-            Bukkit.broadcastMessage(
-                    chatFilter.msg(
-                            "chat_url_broadcast",
-                            "player",
-                            p.getName()));
-        }
-
         // 处罚
         chatFilter.applyPunishment(p, count,
                 "发送违规链接", "系统");