1.2.2 @优化,避免艾特abc的时候abc和abcd都有提醒

Author: handy-git

pom.xml

@@ -6,14 +6,14 @@
 
     <groupId>cn.handyplus.chat</groupId>
     <artifactId>PlayerChat</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <description>一款有点好用的聊天插件</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spigot-api.vesion>1.21.4-R0.1-SNAPSHOT</spigot-api.vesion>
         <lombok.version>1.18.36</lombok.version>
-        <HandyLib.version>3.15.6</HandyLib.version>
+        <HandyLib.version>3.15.8</HandyLib.version>
         <placeholderapi.version>2.11.6</placeholderapi.version>
         <annotations.version>24.1.0</annotations.version>
     </properties>

src/main/java/cn/handyplus/chat/core/ChatUtil.java

@@ -6,6 +6,7 @@
 import cn.handyplus.chat.util.ConfigUtil;
 import cn.handyplus.lib.core.CollUtil;
 import cn.handyplus.lib.core.JsonUtil;
+import cn.handyplus.lib.core.PatternUtil;
 import cn.handyplus.lib.core.StrUtil;
 import cn.handyplus.lib.expand.adapter.HandySchedulerUtil;
 import cn.handyplus.lib.expand.adapter.PlayerSchedulerUtil;
@@ -14,7 +15,6 @@
 import cn.handyplus.lib.util.MessageUtil;
 import cn.handyplus.lib.util.RgbTextUtil;
 import net.md_5.bungee.api.chat.BaseComponent;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -65,9 +65,12 @@ public synchronized static void sendTextMsg(BcUtil.BcMessageParam param, boolean
             }
             MessageUtil.sendMessage(onlinePlayer, textComponent);
             // 如果开启艾特，发送消息
-            if (ChatConstants.CHAT_TYPE.equals(param.getType()) && ConfigUtil.CHAT_CONFIG.getBoolean("at.enable") && chatParam.getMessage().contains(onlinePlayer.getName())) {
-                String sound = ConfigUtil.CHAT_CONFIG.getString("at.sound");
-                playSound(onlinePlayer, sound);
+            if (ChatConstants.CHAT_TYPE.equals(param.getType()) && ConfigUtil.CHAT_CONFIG.getBoolean("at.enable")) {
+                // 获取艾特玩家
+                if (CollUtil.isNotEmpty(chatParam.getMentionedPlayers()) && chatParam.getMentionedPlayers().contains(onlinePlayer.getName())) {
+                    String sound = ConfigUtil.CHAT_CONFIG.getString("at.sound");
+                    playSound(onlinePlayer, sound);
+                }
             }
         }
         // 控制台消息
@@ -240,20 +243,26 @@ private static List<String> replaceStr(Player player, String channelName, List<S
     }
 
     /**
-     * @param message 消息
+     * 处理@人
+     *
+     * @param mentionedPlayers 被@的人
+     * @param message          消息
      * @return 新消息
-     * @ 处理
      * @since 1.0.9
      */
-    public static String at(String message) {
+    public static String at(List<String> mentionedPlayers, String message) {
         boolean enable = ConfigUtil.CHAT_CONFIG.getBoolean("at.enable");
         if (!enable) {
             return message;
         }
-        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-            if (message.contains("@" + onlinePlayer.getName())) {
-                message = message.replace("@" + onlinePlayer.getName(), ChatColor.BLUE + onlinePlayer.getName() + ChatColor.WHITE);
-            }
+        // 提取@的玩家名
+        mentionedPlayers.addAll(PatternUtil.extractAtTags(message));
+        if (CollUtil.isEmpty(mentionedPlayers)) {
+            return message;
+        }
+        // 将 @玩家名 替换为高亮显示
+        for (String playerName : mentionedPlayers) {
+            message = message.replaceAll("@" + playerName, ChatColor.BLUE + playerName + ChatColor.RESET);
         }
         return message;
     }

src/main/java/cn/handyplus/chat/listener/AsyncPlayerChatEventListener.java

@@ -28,7 +28,9 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 当玩家聊天时触发这个事件
@@ -81,7 +83,8 @@ public static void sendMsg(Player player, String message, String channel, String
             return;
         }
         // @处理
-        message = ChatUtil.at(message);
+        List<String> mentionedPlayers = new ArrayList<>();
+        message = ChatUtil.at(mentionedPlayers, message);
         // 参数构建
         BcUtil.BcMessageParam param = new BcUtil.BcMessageParam();
         param.setPluginName(PlayerChat.INSTANCE.getName());
@@ -96,6 +99,8 @@ public static void sendMsg(Player player, String message, String channel, String
         chatParam.setTellPlayerName(tellPlayerName);
         // 原消息内容
         chatParam.setMessage(message);
+        // @玩家处理
+        chatParam.setMentionedPlayers(mentionedPlayers);
         // 有权限进行颜色代码处理
         chatParam.setHasColor(player.hasPermission("playerChat.color"));
         chatParam.setChannel(channel);

src/main/java/cn/handyplus/chat/param/ChatParam.java

@@ -94,4 +94,11 @@ public class ChatParam {
      */
     private String tellPlayerName;
 
+    /**
+     * 被@的人
+     *
+     * @since 1.2.2
+     */
+    private List<String> mentionedPlayers;
+
 }

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: PlayerChat
 main: cn.handyplus.chat.PlayerChat
-version: 1.2.1
+version: 1.2.2
 author: handy
 api-version: 1.13
 softdepend: [ PlaceholderAPI ]