From 5b06049265ab2aa8848d75e38f03cec1689f0c3e Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Sun, 9 Oct 2022 18:04:41 +0200 Subject: [PATCH] Fixed double @ if someone doesn't have a nickname (or has the same nickname as the username) --- .../src/main/java/com/alttd/chat/listeners/ChatListener.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java index b8bdb62..230f18c 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java @@ -96,11 +96,12 @@ public class ChatListener implements Listener { for (Player onlinePlayer : Bukkit.getOnlinePlayers()) { String name = onlinePlayer.getName(); String nickName = PlainTextComponentSerializer.plainText().serialize(onlinePlayer.displayName()); - if (modifiableString.string().toLowerCase().contains(name.toLowerCase())) { + String message = modifiableString.string().toLowerCase(); + if (message.contains(name.toLowerCase())) { modifiableString.replace(Pattern.compile(name, Pattern.CASE_INSENSITIVE), mention.append(onlinePlayer.displayName())); playerToPing.add(onlinePlayer); } - if (modifiableString.string().toLowerCase().contains(nickName.toLowerCase())) { + if (!name.equalsIgnoreCase(nickName) && message.contains(nickName.toLowerCase())) { modifiableString.replace(Pattern.compile(nickName, Pattern.CASE_INSENSITIVE), mention.append(onlinePlayer.displayName())); playerToPing.add(onlinePlayer); }