From 4fb43e2da9f0174d05f6b849d5b6df664914a968 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Mon, 9 Nov 2026 04:41:00 -0600 Subject: [PATCH 01/52] Check if incoming message is the same as last message --- .../essentials/chat/processing/AntiSpam.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java new file mode 100644 index 0000000000..9f5985d4ed --- /dev/null +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -0,0 +1,18 @@ +package com.earth2me.essentials.chat.processing; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +public class AntiSpam { + //Needs a listener, last message cache, compare to last message, + Map lastMessage = new HashMap<>(); + public boolean newMessage(UUID uuid, String message){ + String storedMessage = lastMessage.get(uuid); + if(storedMessage == message){ + return true; + } + lastMessage.put(uuid, message); + return false; + } +} From f14e01cf95557754b5fb7cbfff9763c2fee487a4 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Mon, 9 Nov 2026 04:45:32 -0600 Subject: [PATCH 02/52] Add antispam to highest chat listner --- .../earth2me/essentials/chat/processing/PaperChatHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java index 989816f069..daae111fe6 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java @@ -10,10 +10,11 @@ public class PaperChatHandler extends AbstractChatHandler { public PaperChatHandler(Essentials ess, EssentialsChat essChat) { super(ess, essChat); } - + AntiSpam antiSpam = new AntiSpam(); public void registerListeners() { final PluginManager pm = essChat.getServer().getPluginManager(); pm.registerEvents(new ChatListener(), essChat); + antiSpam = new AntiSpam(); } public final class ChatListener extends PaperChatListenerProvider { @@ -31,6 +32,7 @@ public void onChatNormal(AbstractChatEvent event) { public void onChatHighest(AbstractChatEvent event) { handleChatPostFormat(event); handleChatSubmit(event); + antiSpam.newMessage(event.getPlayer().getUniqueId(), event.getMessage()); } } } From e7d327a5489d3a9df491e8f28c467f87a12de2a6 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Mon, 9 Nov 2026 04:47:29 -0600 Subject: [PATCH 03/52] Check for message matching just with more length --- .../java/com/earth2me/essentials/chat/processing/AntiSpam.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 9f5985d4ed..fa952ff2e4 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -9,7 +9,7 @@ public class AntiSpam { Map lastMessage = new HashMap<>(); public boolean newMessage(UUID uuid, String message){ String storedMessage = lastMessage.get(uuid); - if(storedMessage == message){ + if(storedMessage.equalsIgnoreCase(message) || storedMessage.startsWith(message)) { return true; } lastMessage.put(uuid, message); From 7d3fec798897f9b2f93211f1bf882f638bcf029a Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Mon, 9 Nov 2026 05:04:31 -0600 Subject: [PATCH 04/52] Add getAntiSpam returns the antispam instance --- .../com/earth2me/essentials/chat/processing/AntiSpam.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index fa952ff2e4..71ffd9e16d 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -5,6 +5,10 @@ import java.util.UUID; public class AntiSpam { + static AntiSpam antiSpam; + public AntiSpam() { + antiSpam = this; + } //Needs a listener, last message cache, compare to last message, Map lastMessage = new HashMap<>(); public boolean newMessage(UUID uuid, String message){ @@ -15,4 +19,7 @@ public boolean newMessage(UUID uuid, String message){ lastMessage.put(uuid, message); return false; } + public static AntiSpam getAntiSpam(){ + return antiSpam; + } } From c5660e9baf75d550acb18e13face28e3a6bfd692 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Mon, 9 Nov 2026 05:05:07 -0600 Subject: [PATCH 05/52] Added antispam to chat events. Added to highest priority where applicable --- .../java/com/earth2me/essentials/chat/EssentialsChat.java | 2 ++ .../com/earth2me/essentials/chat/processing/ChatHandler.java | 3 +++ .../essentials/chat/processing/PaperChatHandler.java | 5 ++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChat.java index f7db3796d2..d734310353 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChat.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChat.java @@ -2,6 +2,7 @@ import com.earth2me.essentials.Essentials; import com.earth2me.essentials.EssentialsLogger; +import com.earth2me.essentials.chat.processing.AntiSpam; import com.earth2me.essentials.chat.processing.ChatHandler; import com.earth2me.essentials.chat.processing.PaperChatHandler; import com.earth2me.essentials.metrics.MetricsWrapper; @@ -19,6 +20,7 @@ public class EssentialsChat extends JavaPlugin { private transient IEssentials ess; private transient MetricsWrapper metrics = null; + public transient AntiSpam antiSpam = new AntiSpam(); @Override public void onEnable() { diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java index eb53654525..ba2a6faaee 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java @@ -47,6 +47,9 @@ public void onPlayerChat(AsyncPlayerChatEvent event) { final AbstractChatEvent absEvent = wrap(event); handleChatPostFormat(absEvent); handleChatSubmit(absEvent); + + event.setCancelled(AntiSpam.getAntiSpam().newMessage(event.getPlayer().getUniqueId(), + event.getMessage())); } } } diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java index daae111fe6..a2b155bd85 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java @@ -10,11 +10,9 @@ public class PaperChatHandler extends AbstractChatHandler { public PaperChatHandler(Essentials ess, EssentialsChat essChat) { super(ess, essChat); } - AntiSpam antiSpam = new AntiSpam(); public void registerListeners() { final PluginManager pm = essChat.getServer().getPluginManager(); pm.registerEvents(new ChatListener(), essChat); - antiSpam = new AntiSpam(); } public final class ChatListener extends PaperChatListenerProvider { @@ -32,7 +30,8 @@ public void onChatNormal(AbstractChatEvent event) { public void onChatHighest(AbstractChatEvent event) { handleChatPostFormat(event); handleChatSubmit(event); - antiSpam.newMessage(event.getPlayer().getUniqueId(), event.getMessage()); + event.setCancelled(AntiSpam.getAntiSpam().newMessage(event.getPlayer().getUniqueId(), + event.getMessage())); } } } From 54e775902fe3ed3643606af797033695bd0d196f Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Mon, 9 Nov 2026 05:05:10 -0600 Subject: [PATCH 06/52] Added antispam to chat events. Added to highest priority where applicable --- .../earth2me/essentials/chat/processing/SpigotChatEvent.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/SpigotChatEvent.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/SpigotChatEvent.java index 04ee58f376..6006710703 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/SpigotChatEvent.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/SpigotChatEvent.java @@ -13,6 +13,8 @@ public class SpigotChatEvent implements AbstractChatEvent { public SpigotChatEvent(AsyncPlayerChatEvent event) { this.event = event; + event.setCancelled(AntiSpam.getAntiSpam().newMessage(event.getPlayer().getUniqueId(), + event.getMessage())); } @Override @@ -69,4 +71,5 @@ public void removeRecipients(Predicate predicate) { public void addRecipient(Player player) { event.getRecipients().add(player); } + } From f4e11f8b7ce2bddd80344e7c5e6339526a5b5822 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Wed, 11 Nov 2026 00:47:00 -0600 Subject: [PATCH 07/52] Change new message to accept an event to manipulate Add checks for repeated messages with same ending, and checked for 70%+ caps and set the message to full lowercase --- .../essentials/chat/processing/AntiSpam.java | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 71ffd9e16d..6bd0f98c44 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -1,5 +1,9 @@ package com.earth2me.essentials.chat.processing; +import org.bukkit.entity.Player; +import org.bukkit.event.player.AsyncPlayerChatEvent; + +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -11,13 +15,33 @@ public AntiSpam() { } //Needs a listener, last message cache, compare to last message, Map lastMessage = new HashMap<>(); - public boolean newMessage(UUID uuid, String message){ + public void newMessage(Player player, String message, AsyncPlayerChatEvent event) { + UUID uuid = player.getUniqueId(); String storedMessage = lastMessage.get(uuid); if(storedMessage.equalsIgnoreCase(message) || storedMessage.startsWith(message)) { - return true; + player.sendMessage("Please do not send the same message twice."); + event.setCancelled(true); + return; + } + if(storedMessage.endsWith(message)) { + player.sendMessage("Please do not send the same message twice."); + event.setCancelled(true); + return;} + int count = 0; + + for (int i = 0; i < storedMessage.length(); i++) { + if (Character.isUpperCase(storedMessage.charAt(i))) { + count++; + } } + if(storedMessage.length() * 0.70 > count) { + //return the message to chat with lowercase replaced + event.setMessage(storedMessage.toLowerCase()); + player.sendMessage("Please do not spam capital letters in chat"); + event.setMessage(storedMessage.toLowerCase()); + + return;} lastMessage.put(uuid, message); - return false; } public static AntiSpam getAntiSpam(){ return antiSpam; From 35e63e520c60e9f1e214cf7c397dad32c135ff3b Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Wed, 11 Nov 2026 00:47:14 -0600 Subject: [PATCH 08/52] Not sure I need these here --- .../earth2me/essentials/chat/processing/PaperChatHandler.java | 2 -- .../earth2me/essentials/chat/processing/SpigotChatEvent.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java index a2b155bd85..33ebdf43fe 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java @@ -30,8 +30,6 @@ public void onChatNormal(AbstractChatEvent event) { public void onChatHighest(AbstractChatEvent event) { handleChatPostFormat(event); handleChatSubmit(event); - event.setCancelled(AntiSpam.getAntiSpam().newMessage(event.getPlayer().getUniqueId(), - event.getMessage())); } } } diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/SpigotChatEvent.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/SpigotChatEvent.java index 6006710703..37e3ca5c7a 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/SpigotChatEvent.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/SpigotChatEvent.java @@ -13,8 +13,6 @@ public class SpigotChatEvent implements AbstractChatEvent { public SpigotChatEvent(AsyncPlayerChatEvent event) { this.event = event; - event.setCancelled(AntiSpam.getAntiSpam().newMessage(event.getPlayer().getUniqueId(), - event.getMessage())); } @Override From fe3b06f8b25d9185c3d66b85887f894d3460c990 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Wed, 11 Nov 2026 00:47:30 -0600 Subject: [PATCH 09/52] Pass the event to Antispam --- .../com/earth2me/essentials/chat/processing/ChatHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java index ba2a6faaee..68b88b3ea5 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java @@ -48,8 +48,8 @@ public void onPlayerChat(AsyncPlayerChatEvent event) { handleChatPostFormat(absEvent); handleChatSubmit(absEvent); - event.setCancelled(AntiSpam.getAntiSpam().newMessage(event.getPlayer().getUniqueId(), - event.getMessage())); + AntiSpam.getAntiSpam().newMessage(event.getPlayer(), + event.getMessage(), event); } } } From bdec77947f1c2b3e8f42a89e6136ea2023c4e2cf Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 10:55:53 -0600 Subject: [PATCH 10/52] Add antispam settings to config.yml --- Essentials/src/main/resources/config.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Essentials/src/main/resources/config.yml b/Essentials/src/main/resources/config.yml index 3d3f6ff5d0..01a36ede57 100644 --- a/Essentials/src/main/resources/config.yml +++ b/Essentials/src/main/resources/config.yml @@ -1045,6 +1045,16 @@ chat: # You must restart your server after changing this setting. paper-chat-events: true + #Whether a player should be allowed to send the same, or similar messages. + duplicate-prevention: true + + #Whether chat should have a cooldown per player. + chat-cooldown-enable: false + chat-cooldown-time: 0 + + #Whether messages containing lots of capitols should be changed to lowercase + chat-caps-filter: true + ############################################################ # +------------------------------------------------------+ # # | EssentialsX Protect | # From ee3847a57b054aa65fa24828579b6d1407da2cb1 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 11:20:07 -0600 Subject: [PATCH 11/52] Added antispam timer to increment timers since the players last sent a message. If runable is null we recreate it and continue. Removed unnecessary if statement --- .../essentials/chat/processing/AntiSpam.java | 66 +++++++++++++------ 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 6bd0f98c44..f177e6eceb 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -1,7 +1,11 @@ package com.earth2me.essentials.chat.processing; +import com.earth2me.essentials.Essentials; +import org.bukkit.Color; import org.bukkit.entity.Player; import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.scheduler.BukkitRunnable; +import org.bukkit.scheduler.BukkitTask; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -15,33 +19,57 @@ public AntiSpam() { } //Needs a listener, last message cache, compare to last message, Map lastMessage = new HashMap<>(); + Map lastMessageTimer = new HashMap<>(); + BukkitTask runable; public void newMessage(Player player, String message, AsyncPlayerChatEvent event) { UUID uuid = player.getUniqueId(); String storedMessage = lastMessage.get(uuid); - if(storedMessage.equalsIgnoreCase(message) || storedMessage.startsWith(message)) { - player.sendMessage("Please do not send the same message twice."); - event.setCancelled(true); - return; + Essentials ess = Essentials.getPlugin(Essentials.class); + if(ess.getConfig().getBoolean("duplicate-prevention")) { + if (storedMessage.equalsIgnoreCase(message) || storedMessage.startsWith(message)|| storedMessage.endsWith(message)) { + player.sendMessage(Color.RED + "Please do not send the same message twice."); + event.setCancelled(true); + return; + } } - if(storedMessage.endsWith(message)) { - player.sendMessage("Please do not send the same message twice."); - event.setCancelled(true); - return;} - int count = 0; + if(ess.getConfig().getBoolean("chat-caps-filter")) { + + int count = 0; + + for (int i = 0; i < storedMessage.length(); i++) { + if (Character.isUpperCase(storedMessage.charAt(i))) { + count++; + } + } + if (storedMessage.length() * 0.70 > count) { + //return the message to chat with lowercase replaced + event.setMessage(storedMessage.toLowerCase()); + player.sendMessage(Color.RED + "Please do not spam capital letters in chat"); + event.setMessage(storedMessage.toLowerCase()); - for (int i = 0; i < storedMessage.length(); i++) { - if (Character.isUpperCase(storedMessage.charAt(i))) { - count++; + return; } + lastMessage.put(uuid, message); } - if(storedMessage.length() * 0.70 > count) { - //return the message to chat with lowercase replaced - event.setMessage(storedMessage.toLowerCase()); - player.sendMessage("Please do not spam capital letters in chat"); - event.setMessage(storedMessage.toLowerCase()); + if(ess.getConfig().getBoolean("chat-cooldown-enable")){ + if(runable == null){ + runable = new BukkitRunnable() { + @Override + public void run() { + for(Map.Entry entry : lastMessageTimer.entrySet()){ + entry.setValue(entry.getValue() + 1); + if(entry.getValue() >= 5){ lastMessageTimer.remove(entry.getKey()); - return;} - lastMessage.put(uuid, message); + } + } + } + }.runTaskTimer(ess, 20L, 20L); + } + } + if (lastMessage.containsKey(uuid)) { + event.setCancelled(true); + player.sendMessage(Color.RED + "There is currently a chat cooldown. Please wait " + lastMessage.get(uuid) + " seconds before sending another message."); + } } public static AntiSpam getAntiSpam(){ return antiSpam; From 41aba0cf4dfbf2097f77820014b6fe15f238ddae Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 11:33:28 -0600 Subject: [PATCH 12/52] Added checks for runable commands in response to a player sending a duplicate message or a message with too many capitol letters. Added permission bypass for chat cooldown --- .../essentials/chat/processing/AntiSpam.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index f177e6eceb..4556516610 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -2,6 +2,8 @@ import com.earth2me.essentials.Essentials; import org.bukkit.Color; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.scheduler.BukkitRunnable; @@ -10,6 +12,7 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.UUID; public class AntiSpam { @@ -21,14 +24,19 @@ public AntiSpam() { Map lastMessage = new HashMap<>(); Map lastMessageTimer = new HashMap<>(); BukkitTask runable; + FileConfiguration config; public void newMessage(Player player, String message, AsyncPlayerChatEvent event) { UUID uuid = player.getUniqueId(); String storedMessage = lastMessage.get(uuid); Essentials ess = Essentials.getPlugin(Essentials.class); + config = ess.getConfig(); if(ess.getConfig().getBoolean("duplicate-prevention")) { if (storedMessage.equalsIgnoreCase(message) || storedMessage.startsWith(message)|| storedMessage.endsWith(message)) { player.sendMessage(Color.RED + "Please do not send the same message twice."); event.setCancelled(true); + if (Objects.requireNonNull(config.getString("duplicate-punish")).equalsIgnoreCase("")) { + ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("duplicate-punish"))); + } return; } } @@ -46,11 +54,15 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event event.setMessage(storedMessage.toLowerCase()); player.sendMessage(Color.RED + "Please do not spam capital letters in chat"); event.setMessage(storedMessage.toLowerCase()); + if(Objects.requireNonNull(config.getString("caps-punish")).equalsIgnoreCase("")){ + ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("caps-punish"))); + } return; } lastMessage.put(uuid, message); } + if(player.hasPermission("essentials.chat.bypass.cooldown")) return; if(ess.getConfig().getBoolean("chat-cooldown-enable")){ if(runable == null){ runable = new BukkitRunnable() { @@ -58,7 +70,7 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event public void run() { for(Map.Entry entry : lastMessageTimer.entrySet()){ entry.setValue(entry.getValue() + 1); - if(entry.getValue() >= 5){ lastMessageTimer.remove(entry.getKey()); + if(entry.getValue() >= ess.getConfig().getInt("chat-cooldown-time")){ lastMessageTimer.remove(entry.getKey()); } } From ab4024367ec8a80d9e600ea5289ec9edb5941bb0 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 11:34:16 -0600 Subject: [PATCH 13/52] Added duplicate punish and caps punish to config.yml --- Essentials/src/main/resources/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Essentials/src/main/resources/config.yml b/Essentials/src/main/resources/config.yml index 01a36ede57..acfb90e2ab 100644 --- a/Essentials/src/main/resources/config.yml +++ b/Essentials/src/main/resources/config.yml @@ -1048,6 +1048,9 @@ chat: #Whether a player should be allowed to send the same, or similar messages. duplicate-prevention: true + #Whether we run a command in response to duplicate messages. Leave empty for no punishment. + duplicate-punish: + #Whether chat should have a cooldown per player. chat-cooldown-enable: false chat-cooldown-time: 0 @@ -1055,6 +1058,9 @@ chat: #Whether messages containing lots of capitols should be changed to lowercase chat-caps-filter: true + #Whether we run a command in response to too many capitol letters. Leave empty for no punishment. + caps-punishment: + ############################################################ # +------------------------------------------------------+ # # | EssentialsX Protect | # From a9f8dd17b3a5702cf42aa5630cb84da3a91948df Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 11:34:30 -0600 Subject: [PATCH 14/52] Added chat cooldown bypass to plugin.yml --- EssentialsChat/src/main/resources/plugin.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/EssentialsChat/src/main/resources/plugin.yml b/EssentialsChat/src/main/resources/plugin.yml index a6b5103403..4113b45c08 100644 --- a/EssentialsChat/src/main/resources/plugin.yml +++ b/EssentialsChat/src/main/resources/plugin.yml @@ -43,3 +43,6 @@ permissions: essentials.chat.receive.question: default: true description: Allows access to receiving global question chat messages + essentials.chat.bypass.cooldown: + default: false + description: Allows a player to bypass chat cooldowns From 2537dfeb4b02106cf2b0c0889e0de15d3dd2e0d6 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 11:43:34 -0600 Subject: [PATCH 15/52] Store the message in lowercase to help prevent bypass due to messages being the same except for capitalization Also check for caps abuse first to prevent the above --- .../essentials/chat/processing/AntiSpam.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 4556516610..6e468456df 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -10,10 +10,7 @@ import org.bukkit.scheduler.BukkitTask; import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.UUID; +import java.util.*; public class AntiSpam { static AntiSpam antiSpam; @@ -30,16 +27,7 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event String storedMessage = lastMessage.get(uuid); Essentials ess = Essentials.getPlugin(Essentials.class); config = ess.getConfig(); - if(ess.getConfig().getBoolean("duplicate-prevention")) { - if (storedMessage.equalsIgnoreCase(message) || storedMessage.startsWith(message)|| storedMessage.endsWith(message)) { - player.sendMessage(Color.RED + "Please do not send the same message twice."); - event.setCancelled(true); - if (Objects.requireNonNull(config.getString("duplicate-punish")).equalsIgnoreCase("")) { - ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("duplicate-punish"))); - } - return; - } - } + // Check for caps first to prevent bypass due to caps and noncaps messages having identical messages if(ess.getConfig().getBoolean("chat-caps-filter")) { int count = 0; @@ -60,7 +48,17 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event return; } - lastMessage.put(uuid, message); + lastMessage.put(uuid, message.toLowerCase()); + } + if(ess.getConfig().getBoolean("duplicate-prevention")) { + if (lastMessage.get(uuid).equalsIgnoreCase(message) || lastMessage.get(uuid).startsWith(message)|| lastMessage.get(uuid).endsWith(message)) { + player.sendMessage(Color.RED + "Please do not send the same message twice."); + event.setCancelled(true); + if (Objects.requireNonNull(config.getString("duplicate-punish")).equalsIgnoreCase("")) { + ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("duplicate-punish"))); + } + return; + } } if(player.hasPermission("essentials.chat.bypass.cooldown")) return; if(ess.getConfig().getBoolean("chat-cooldown-enable")){ From fb8e802260ee5a8e144bf84b12b7703d0006e964 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 11:43:51 -0600 Subject: [PATCH 16/52] Better explained features in config.yml --- Essentials/src/main/resources/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Essentials/src/main/resources/config.yml b/Essentials/src/main/resources/config.yml index acfb90e2ab..a8b37bfdde 100644 --- a/Essentials/src/main/resources/config.yml +++ b/Essentials/src/main/resources/config.yml @@ -1045,7 +1045,8 @@ chat: # You must restart your server after changing this setting. paper-chat-events: true - #Whether a player should be allowed to send the same, or similar messages. + #When enabled the plugin sends a message to the player letting them know not to send similar messages. + #Whether duplicate messages should be blocked. duplicate-prevention: true #Whether we run a command in response to duplicate messages. Leave empty for no punishment. @@ -1055,6 +1056,8 @@ chat: chat-cooldown-enable: false chat-cooldown-time: 0 + #When enabled the plugin sends a message to the player letting them know not to use too many capitol letters. + #Message is converted to lowercase before being sent #Whether messages containing lots of capitols should be changed to lowercase chat-caps-filter: true From c43ac41696f0949af7bc9d40cc4304b0641d8f34 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 11:46:59 -0600 Subject: [PATCH 17/52] Correct improper check for lastMessageTimer --- .../java/com/earth2me/essentials/chat/processing/AntiSpam.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 6e468456df..236819b4b3 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -62,6 +62,7 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event } if(player.hasPermission("essentials.chat.bypass.cooldown")) return; if(ess.getConfig().getBoolean("chat-cooldown-enable")){ + //if task is shutdown for some reason, recreate it if(runable == null){ runable = new BukkitRunnable() { @Override @@ -76,7 +77,7 @@ public void run() { }.runTaskTimer(ess, 20L, 20L); } } - if (lastMessage.containsKey(uuid)) { + if (lastMessageTimer.containsKey(uuid)) { event.setCancelled(true); player.sendMessage(Color.RED + "There is currently a chat cooldown. Please wait " + lastMessage.get(uuid) + " seconds before sending another message."); } From 988fe6e99e040992fd22a8bb81408571b712055e Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 11:52:10 -0600 Subject: [PATCH 18/52] Proper initialization --- .../essentials/chat/processing/AntiSpam.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 236819b4b3..a997026d72 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -14,19 +14,25 @@ public class AntiSpam { static AntiSpam antiSpam; + + Essentials ess = Essentials.getPlugin(Essentials.class); + private final FileConfiguration config; + + private final Map lastMessage; + private final Map lastMessageTimer; + private BukkitTask runable; + public AntiSpam() { antiSpam = this; + config = ess.getConfig(); + lastMessage = new HashMap<>(); + lastMessageTimer = new HashMap<>(); } - //Needs a listener, last message cache, compare to last message, - Map lastMessage = new HashMap<>(); - Map lastMessageTimer = new HashMap<>(); - BukkitTask runable; - FileConfiguration config; + + public void newMessage(Player player, String message, AsyncPlayerChatEvent event) { UUID uuid = player.getUniqueId(); String storedMessage = lastMessage.get(uuid); - Essentials ess = Essentials.getPlugin(Essentials.class); - config = ess.getConfig(); // Check for caps first to prevent bypass due to caps and noncaps messages having identical messages if(ess.getConfig().getBoolean("chat-caps-filter")) { From 8f198dd61254ffebcbda405a2c95e0da704dfdd7 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 11:58:16 -0600 Subject: [PATCH 19/52] Fix improper chat punish checks and check if entry exists, if not add entry and set value to 0 --- .../com/earth2me/essentials/chat/processing/AntiSpam.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index a997026d72..9363c2eb5c 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -48,7 +48,7 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event event.setMessage(storedMessage.toLowerCase()); player.sendMessage(Color.RED + "Please do not spam capital letters in chat"); event.setMessage(storedMessage.toLowerCase()); - if(Objects.requireNonNull(config.getString("caps-punish")).equalsIgnoreCase("")){ + if(!Objects.requireNonNull(config.getString("caps-punish")).isEmpty()){ ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("caps-punish"))); } @@ -60,7 +60,7 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event if (lastMessage.get(uuid).equalsIgnoreCase(message) || lastMessage.get(uuid).startsWith(message)|| lastMessage.get(uuid).endsWith(message)) { player.sendMessage(Color.RED + "Please do not send the same message twice."); event.setCancelled(true); - if (Objects.requireNonNull(config.getString("duplicate-punish")).equalsIgnoreCase("")) { + if (!Objects.requireNonNull(config.getString("duplicate-punish")).isEmpty()) { ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("duplicate-punish"))); } return; @@ -74,6 +74,9 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event @Override public void run() { for(Map.Entry entry : lastMessageTimer.entrySet()){ + if(entry.getValue() == null){ + entry.setValue(0); + } entry.setValue(entry.getValue() + 1); if(entry.getValue() >= ess.getConfig().getInt("chat-cooldown-time")){ lastMessageTimer.remove(entry.getKey()); From 9266d4ff711a6248d7391783f97a1dfd21f700d0 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 12:01:26 -0600 Subject: [PATCH 20/52] Apply changes to the map itself not the queued entry --- .../earth2me/essentials/chat/processing/AntiSpam.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 9363c2eb5c..fa3eb21f6d 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -74,11 +74,12 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event @Override public void run() { for(Map.Entry entry : lastMessageTimer.entrySet()){ - if(entry.getValue() == null){ - entry.setValue(0); + if(lastMessageTimer.get(entry.getKey()) == null){ + lastMessageTimer.putIfAbsent(entry.getKey(), 0); } - entry.setValue(entry.getValue() + 1); - if(entry.getValue() >= ess.getConfig().getInt("chat-cooldown-time")){ lastMessageTimer.remove(entry.getKey()); + lastMessageTimer.put(entry.getKey(), entry.getValue() +1); + if(entry.getValue() >= ess.getConfig().getInt("chat-cooldown-time")){ + lastMessageTimer.remove(entry.getKey()); } } From 183a911ce69a6bd3da6e0e80b478873b8972dd34 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 12:02:34 -0600 Subject: [PATCH 21/52] Corrected config lookups --- .../com/earth2me/essentials/chat/processing/AntiSpam.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index fa3eb21f6d..4d3f8d0e92 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -34,7 +34,7 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event UUID uuid = player.getUniqueId(); String storedMessage = lastMessage.get(uuid); // Check for caps first to prevent bypass due to caps and noncaps messages having identical messages - if(ess.getConfig().getBoolean("chat-caps-filter")) { + if(ess.getConfig().getBoolean("chat.chat-caps-filter")) { int count = 0; @@ -56,7 +56,7 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event } lastMessage.put(uuid, message.toLowerCase()); } - if(ess.getConfig().getBoolean("duplicate-prevention")) { + if(ess.getConfig().getBoolean("chat.duplicate-prevention")) { if (lastMessage.get(uuid).equalsIgnoreCase(message) || lastMessage.get(uuid).startsWith(message)|| lastMessage.get(uuid).endsWith(message)) { player.sendMessage(Color.RED + "Please do not send the same message twice."); event.setCancelled(true); @@ -67,7 +67,7 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event } } if(player.hasPermission("essentials.chat.bypass.cooldown")) return; - if(ess.getConfig().getBoolean("chat-cooldown-enable")){ + if(ess.getConfig().getBoolean("chat.chat-cooldown-enable")){ //if task is shutdown for some reason, recreate it if(runable == null){ runable = new BukkitRunnable() { @@ -78,7 +78,7 @@ public void run() { lastMessageTimer.putIfAbsent(entry.getKey(), 0); } lastMessageTimer.put(entry.getKey(), entry.getValue() +1); - if(entry.getValue() >= ess.getConfig().getInt("chat-cooldown-time")){ + if(entry.getValue() >= ess.getConfig().getInt("chat.chat-cooldown-time")){ lastMessageTimer.remove(entry.getKey()); } From 7ca7e093ac0d443c8a8c7740e9f56d9d2560b780 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 12:07:54 -0600 Subject: [PATCH 22/52] Corrected variables for comparison --- .../essentials/chat/processing/AntiSpam.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 4d3f8d0e92..2155345290 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -11,6 +11,7 @@ import java.nio.charset.StandardCharsets; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; public class AntiSpam { static AntiSpam antiSpam; @@ -32,22 +33,21 @@ public AntiSpam() { public void newMessage(Player player, String message, AsyncPlayerChatEvent event) { UUID uuid = player.getUniqueId(); - String storedMessage = lastMessage.get(uuid); // Check for caps first to prevent bypass due to caps and noncaps messages having identical messages if(ess.getConfig().getBoolean("chat.chat-caps-filter")) { int count = 0; - for (int i = 0; i < storedMessage.length(); i++) { - if (Character.isUpperCase(storedMessage.charAt(i))) { + for (int i = 0; i < message.length(); i++) { + if (Character.isUpperCase(message.charAt(i))) { count++; } } - if (storedMessage.length() * 0.70 > count) { + if (message.length() * 0.70 > count) { //return the message to chat with lowercase replaced - event.setMessage(storedMessage.toLowerCase()); + event.setMessage(message.toLowerCase()); player.sendMessage(Color.RED + "Please do not spam capital letters in chat"); - event.setMessage(storedMessage.toLowerCase()); + event.setMessage(message.toLowerCase()); if(!Objects.requireNonNull(config.getString("caps-punish")).isEmpty()){ ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("caps-punish"))); } From 2eda8cd120e07d65378008e23ea4c0c6474e099c Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 12:08:11 -0600 Subject: [PATCH 23/52] Make hash maps concurrent for the async timer --- .../com/earth2me/essentials/chat/processing/AntiSpam.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 2155345290..d378820332 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -26,8 +26,8 @@ public class AntiSpam { public AntiSpam() { antiSpam = this; config = ess.getConfig(); - lastMessage = new HashMap<>(); - lastMessageTimer = new HashMap<>(); + lastMessage = new ConcurrentHashMap<>(); + lastMessageTimer = new ConcurrentHashMap<>(); } From e32f2d2b30cfa320d7f1a7f9392dc947d8f770e7 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 12:10:11 -0600 Subject: [PATCH 24/52] Fire antispam before chat is processed --- .../com/earth2me/essentials/chat/processing/ChatHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java index 68b88b3ea5..b1c0b4dbde 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java @@ -44,12 +44,13 @@ private final class ChatHighest implements ChatListener { @Override @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerChat(AsyncPlayerChatEvent event) { + AntiSpam.getAntiSpam().newMessage(event.getPlayer(), + event.getMessage(), event); final AbstractChatEvent absEvent = wrap(event); handleChatPostFormat(absEvent); handleChatSubmit(absEvent); - AntiSpam.getAntiSpam().newMessage(event.getPlayer(), - event.getMessage(), event); + } } } From b1f68a3aa20db1238d3b2eeed67f348cfd0239c4 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 12:18:08 -0600 Subject: [PATCH 25/52] Make AntiSpam.java easier to maintain --- .../essentials/chat/processing/AntiSpam.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index d378820332..6a93820f46 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -32,8 +32,12 @@ public AntiSpam() { public void newMessage(Player player, String message, AsyncPlayerChatEvent event) { - UUID uuid = player.getUniqueId(); - // Check for caps first to prevent bypass due to caps and noncaps messages having identical messages + capsFilter(message, player, event); + duplicationFilter(message, player, event); + chatCooldown(player, event); + + } + private void capsFilter(String message, Player player, AsyncPlayerChatEvent event) { if(ess.getConfig().getBoolean("chat.chat-caps-filter")) { int count = 0; @@ -54,18 +58,22 @@ public void newMessage(Player player, String message, AsyncPlayerChatEvent event return; } - lastMessage.put(uuid, message.toLowerCase()); + lastMessage.put(player.getUniqueId(), message.toLowerCase()); } + } + private void duplicationFilter(String message, Player player, AsyncPlayerChatEvent event) { if(ess.getConfig().getBoolean("chat.duplicate-prevention")) { + UUID uuid = player.getUniqueId(); if (lastMessage.get(uuid).equalsIgnoreCase(message) || lastMessage.get(uuid).startsWith(message)|| lastMessage.get(uuid).endsWith(message)) { player.sendMessage(Color.RED + "Please do not send the same message twice."); event.setCancelled(true); if (!Objects.requireNonNull(config.getString("duplicate-punish")).isEmpty()) { ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("duplicate-punish"))); } - return; } } + } + private void chatCooldown(Player player, AsyncPlayerChatEvent event) { if(player.hasPermission("essentials.chat.bypass.cooldown")) return; if(ess.getConfig().getBoolean("chat.chat-cooldown-enable")){ //if task is shutdown for some reason, recreate it @@ -87,7 +95,7 @@ public void run() { }.runTaskTimer(ess, 20L, 20L); } } - if (lastMessageTimer.containsKey(uuid)) { + if (lastMessageTimer.containsKey(player.getUniqueId())) { event.setCancelled(true); player.sendMessage(Color.RED + "There is currently a chat cooldown. Please wait " + lastMessage.get(uuid) + " seconds before sending another message."); } From 26a3c9d5b8a301eb84bf3c82ab440a52178fcdeb Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 12:19:52 -0600 Subject: [PATCH 26/52] fixed variable assignment --- .../java/com/earth2me/essentials/chat/processing/AntiSpam.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 6a93820f46..97ed521209 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -51,7 +51,6 @@ private void capsFilter(String message, Player player, AsyncPlayerChatEvent even //return the message to chat with lowercase replaced event.setMessage(message.toLowerCase()); player.sendMessage(Color.RED + "Please do not spam capital letters in chat"); - event.setMessage(message.toLowerCase()); if(!Objects.requireNonNull(config.getString("caps-punish")).isEmpty()){ ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("caps-punish"))); } @@ -97,7 +96,7 @@ public void run() { } if (lastMessageTimer.containsKey(player.getUniqueId())) { event.setCancelled(true); - player.sendMessage(Color.RED + "There is currently a chat cooldown. Please wait " + lastMessage.get(uuid) + " seconds before sending another message."); + player.sendMessage(Color.RED + "There is currently a chat cooldown. Please wait " + lastMessage.get(player.getUniqueId()) + " seconds before sending another message."); } } public static AntiSpam getAntiSpam(){ From 20a378993bcded109d46a0055218cc66b91b416e Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 12:20:55 -0600 Subject: [PATCH 27/52] Fixed backwords logic on caps filter --- .../java/com/earth2me/essentials/chat/processing/AntiSpam.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 97ed521209..5d4dd1aa2d 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -47,7 +47,7 @@ private void capsFilter(String message, Player player, AsyncPlayerChatEvent even count++; } } - if (message.length() * 0.70 > count) { + if (message.length() * 0.70 < count) { //return the message to chat with lowercase replaced event.setMessage(message.toLowerCase()); player.sendMessage(Color.RED + "Please do not spam capital letters in chat"); From b4e9261b15bb95508f4d1239878534783a498fa1 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 12:22:04 -0600 Subject: [PATCH 28/52] Add the message to the map after processing --- .../java/com/earth2me/essentials/chat/processing/AntiSpam.java | 1 + 1 file changed, 1 insertion(+) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 5d4dd1aa2d..0fec5b45ee 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -71,6 +71,7 @@ private void duplicationFilter(String message, Player player, AsyncPlayerChatEve } } } + lastMessage.put(player.getUniqueId(), message.toLowerCase()); } private void chatCooldown(Player player, AsyncPlayerChatEvent event) { if(player.hasPermission("essentials.chat.bypass.cooldown")) return; From 2d537b26f4713f5f837ccd77e9a0bd6f629240b2 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 12:32:23 -0600 Subject: [PATCH 29/52] Check all messages in lowercase for duplication filter --- .../com/earth2me/essentials/chat/processing/AntiSpam.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 0fec5b45ee..c379da6c92 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -54,16 +54,16 @@ private void capsFilter(String message, Player player, AsyncPlayerChatEvent even if(!Objects.requireNonNull(config.getString("caps-punish")).isEmpty()){ ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("caps-punish"))); } - - return; } - lastMessage.put(player.getUniqueId(), message.toLowerCase()); } } private void duplicationFilter(String message, Player player, AsyncPlayerChatEvent event) { + lastMessage.put(player.getUniqueId(), message.toLowerCase(Locale.ROOT)); if(ess.getConfig().getBoolean("chat.duplicate-prevention")) { UUID uuid = player.getUniqueId(); - if (lastMessage.get(uuid).equalsIgnoreCase(message) || lastMessage.get(uuid).startsWith(message)|| lastMessage.get(uuid).endsWith(message)) { + if (lastMessage.get(uuid).equalsIgnoreCase(message) || + lastMessage.get(uuid).startsWith(message.toLowerCase(Locale.ROOT))|| + lastMessage.get(uuid).endsWith(message.toLowerCase(Locale.ROOT))) { player.sendMessage(Color.RED + "Please do not send the same message twice."); event.setCancelled(true); if (!Objects.requireNonNull(config.getString("duplicate-punish")).isEmpty()) { From babf76b0d249019513c29a6d166d0333c643b7be Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 17:04:41 -0600 Subject: [PATCH 30/52] Add method to separate out event types and process them correctly --- .../essentials/chat/processing/AntiSpam.java | 40 +++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index c379da6c92..c469e84973 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -1,10 +1,14 @@ package com.earth2me.essentials.chat.processing; import com.earth2me.essentials.Essentials; +import net.ess3.provider.AbstractChatEvent; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import org.bukkit.Color; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; +import org.bukkit.event.Event; import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitTask; @@ -31,13 +35,22 @@ public AntiSpam() { } - public void newMessage(Player player, String message, AsyncPlayerChatEvent event) { - capsFilter(message, player, event); - duplicationFilter(message, player, event); - chatCooldown(player, event); + public void newMessage(AsyncPlayerChatEvent event) { + Player player = event.getPlayer(); + String message = event.getMessage(); + event.setMessage(capsFilter(message, player)); + event.setCancelled(duplicationFilter(message, player)); + event.setCancelled(chatCooldown(player));; + } + public void newMessagePaper(AbstractChatEvent event){ + Player player = event.getPlayer(); + String message = event.getMessage(); + event.setMessage(capsFilter(message, player)); + event.setCancelled(duplicationFilter(message, player)); + event.setCancelled(chatCooldown(player));; } - private void capsFilter(String message, Player player, AsyncPlayerChatEvent event) { + private String capsFilter(String message, Player player) { if(ess.getConfig().getBoolean("chat.chat-caps-filter")) { int count = 0; @@ -49,15 +62,16 @@ private void capsFilter(String message, Player player, AsyncPlayerChatEvent even } if (message.length() * 0.70 < count) { //return the message to chat with lowercase replaced - event.setMessage(message.toLowerCase()); player.sendMessage(Color.RED + "Please do not spam capital letters in chat"); if(!Objects.requireNonNull(config.getString("caps-punish")).isEmpty()){ ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("caps-punish"))); } + return message.toLowerCase(Locale.ROOT); } } + return message; } - private void duplicationFilter(String message, Player player, AsyncPlayerChatEvent event) { + private boolean duplicationFilter(String message, Player player) { lastMessage.put(player.getUniqueId(), message.toLowerCase(Locale.ROOT)); if(ess.getConfig().getBoolean("chat.duplicate-prevention")) { UUID uuid = player.getUniqueId(); @@ -65,16 +79,18 @@ private void duplicationFilter(String message, Player player, AsyncPlayerChatEve lastMessage.get(uuid).startsWith(message.toLowerCase(Locale.ROOT))|| lastMessage.get(uuid).endsWith(message.toLowerCase(Locale.ROOT))) { player.sendMessage(Color.RED + "Please do not send the same message twice."); - event.setCancelled(true); if (!Objects.requireNonNull(config.getString("duplicate-punish")).isEmpty()) { ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("duplicate-punish"))); } + lastMessage.put(player.getUniqueId(), message.toLowerCase()); + return true; } } lastMessage.put(player.getUniqueId(), message.toLowerCase()); + return false; } - private void chatCooldown(Player player, AsyncPlayerChatEvent event) { - if(player.hasPermission("essentials.chat.bypass.cooldown")) return; + private boolean chatCooldown(Player player) { + if(player.hasPermission("essentials.chat.bypass.cooldown")) return false; if(ess.getConfig().getBoolean("chat.chat-cooldown-enable")){ //if task is shutdown for some reason, recreate it if(runable == null){ @@ -88,7 +104,6 @@ public void run() { lastMessageTimer.put(entry.getKey(), entry.getValue() +1); if(entry.getValue() >= ess.getConfig().getInt("chat.chat-cooldown-time")){ lastMessageTimer.remove(entry.getKey()); - } } } @@ -96,9 +111,10 @@ public void run() { } } if (lastMessageTimer.containsKey(player.getUniqueId())) { - event.setCancelled(true); player.sendMessage(Color.RED + "There is currently a chat cooldown. Please wait " + lastMessage.get(player.getUniqueId()) + " seconds before sending another message."); + return true; } + return false; } public static AntiSpam getAntiSpam(){ return antiSpam; From e8f8681b5fa57d9739e5980bb4d5eac4948926e7 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 17:05:05 -0600 Subject: [PATCH 31/52] Pass along the event only since the event holds all the data we need. --- .../com/earth2me/essentials/chat/processing/ChatHandler.java | 4 ++-- .../earth2me/essentials/chat/processing/PaperChatHandler.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java index b1c0b4dbde..7304565f9c 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java @@ -3,6 +3,7 @@ import com.earth2me.essentials.Essentials; import com.earth2me.essentials.chat.EssentialsChat; import net.ess3.provider.AbstractChatEvent; +import org.bukkit.event.Event; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; @@ -44,8 +45,7 @@ private final class ChatHighest implements ChatListener { @Override @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerChat(AsyncPlayerChatEvent event) { - AntiSpam.getAntiSpam().newMessage(event.getPlayer(), - event.getMessage(), event); + AntiSpam.getAntiSpam().newMessage(event); final AbstractChatEvent absEvent = wrap(event); handleChatPostFormat(absEvent); handleChatSubmit(absEvent); diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java index 33ebdf43fe..18a0da3176 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java @@ -4,6 +4,7 @@ import com.earth2me.essentials.chat.EssentialsChat; import net.ess3.provider.AbstractChatEvent; import net.ess3.provider.providers.PaperChatListenerProvider; +import org.bukkit.event.Event; import org.bukkit.plugin.PluginManager; public class PaperChatHandler extends AbstractChatHandler { @@ -28,6 +29,7 @@ public void onChatNormal(AbstractChatEvent event) { @Override public void onChatHighest(AbstractChatEvent event) { + AntiSpam.getAntiSpam().newMessagePaper(event); handleChatPostFormat(event); handleChatSubmit(event); } From 7232e03f3911ec0f09afa6cc0397a0008aaa0e03 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:20:38 -0600 Subject: [PATCH 32/52] Imports --- .../essentials/chat/processing/AntiSpam.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index c469e84973..f08329e9e0 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -2,19 +2,13 @@ import com.earth2me.essentials.Essentials; import net.ess3.provider.AbstractChatEvent; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; -import org.bukkit.Color; +import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.scheduler.BukkitRunnable; -import org.bukkit.scheduler.BukkitTask; -import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; public class AntiSpam { From 34c0547105cdda5169fce4d5b980b083075fe57e Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:20:49 -0600 Subject: [PATCH 33/52] Formatting --- .../com/earth2me/essentials/chat/processing/AntiSpam.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index f08329e9e0..c064235ff4 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -12,14 +12,12 @@ import java.util.concurrent.ConcurrentHashMap; public class AntiSpam { - static AntiSpam antiSpam; + private static AntiSpam antiSpam; + private final Essentials ess = Essentials.getPlugin(Essentials.class); - Essentials ess = Essentials.getPlugin(Essentials.class); private final FileConfiguration config; - private final Map lastMessage; - private final Map lastMessageTimer; - private BukkitTask runable; + private final Map cooldowns; public AntiSpam() { antiSpam = this; From fdcc5e902991ecd3f030c44d3ae9ff7d242c2ca3 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:21:22 -0600 Subject: [PATCH 34/52] Rebuilt potions of the AntiSpam service to provide results expected with the feature request. --- .../essentials/chat/processing/AntiSpam.java | 116 ++++++++++-------- 1 file changed, 63 insertions(+), 53 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index c064235ff4..d5e49201c8 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -23,30 +23,24 @@ public AntiSpam() { antiSpam = this; config = ess.getConfig(); lastMessage = new ConcurrentHashMap<>(); - lastMessageTimer = new ConcurrentHashMap<>(); + cooldowns = new ConcurrentHashMap<>(); + ess.getServer().getPluginManager().registerEvents(new PlayerDisconnectListner(), ess); } - - public void newMessage(AsyncPlayerChatEvent event) { - Player player = event.getPlayer(); - String message = event.getMessage(); + public void newMessage(AbstractChatEvent event){ + final Player player = event.getPlayer(); + final String message = event.getMessage(); event.setMessage(capsFilter(message, player)); - event.setCancelled(duplicationFilter(message, player)); - event.setCancelled(chatCooldown(player));; + event.setCancelled( + event.isCancelled() + || duplicationFilter(message, player) + || chatCooldown(player) + ); } - public void newMessagePaper(AbstractChatEvent event){ - Player player = event.getPlayer(); - String message = event.getMessage(); - event.setMessage(capsFilter(message, player)); - event.setCancelled(duplicationFilter(message, player)); - event.setCancelled(chatCooldown(player));; - } private String capsFilter(String message, Player player) { if(ess.getConfig().getBoolean("chat.chat-caps-filter")) { - int count = 0; - for (int i = 0; i < message.length(); i++) { if (Character.isUpperCase(message.charAt(i))) { count++; @@ -54,61 +48,77 @@ private String capsFilter(String message, Player player) { } if (message.length() * 0.70 < count) { //return the message to chat with lowercase replaced - player.sendMessage(Color.RED + "Please do not spam capital letters in chat"); - if(!Objects.requireNonNull(config.getString("caps-punish")).isEmpty()){ - ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("caps-punish"))); + player.sendMessage(ChatColor.RED + "Please do not spam capital letters in chat"); + final String command = config.getString("caps-punish"); + + if (command != null && !command.trim().isEmpty()) { + ess.getServer().dispatchCommand( + ess.getServer().getConsoleSender(), + command.replace("{player}", player.getName()) + ); } return message.toLowerCase(Locale.ROOT); } } return message; + } + private boolean duplicationFilter(String message, Player player) { - lastMessage.put(player.getUniqueId(), message.toLowerCase(Locale.ROOT)); - if(ess.getConfig().getBoolean("chat.duplicate-prevention")) { - UUID uuid = player.getUniqueId(); - if (lastMessage.get(uuid).equalsIgnoreCase(message) || - lastMessage.get(uuid).startsWith(message.toLowerCase(Locale.ROOT))|| - lastMessage.get(uuid).endsWith(message.toLowerCase(Locale.ROOT))) { - player.sendMessage(Color.RED + "Please do not send the same message twice."); - if (!Objects.requireNonNull(config.getString("duplicate-punish")).isEmpty()) { - ess.getServer().dispatchCommand(ess.getServer().getConsoleSender(), Objects.requireNonNull(config.getString("duplicate-punish"))); - } - lastMessage.put(player.getUniqueId(), message.toLowerCase()); - return true; + if (!config.getBoolean("chat.duplicate-prevention")) { + return false; + } + + final UUID uuid = player.getUniqueId(); + final String normalizedMessage = message.toLowerCase(Locale.ROOT); + final String previousMessage = lastMessage.get(uuid); + + if (previousMessage != null + && (previousMessage.equals(normalizedMessage) + || previousMessage.startsWith(normalizedMessage) + || previousMessage.endsWith(normalizedMessage))) { + final String command = config.getString("duplication-punish"); + if (command != null && !command.trim().isEmpty()) { + ess.getServer().dispatchCommand( + ess.getServer().getConsoleSender(), + command.replace("{player}", player.getName()) + ); } + player.sendMessage(ChatColor.RED + "Please do not send the same message twice."); + return true; } - lastMessage.put(player.getUniqueId(), message.toLowerCase()); + lastMessage.put(uuid, normalizedMessage); return false; } + private boolean chatCooldown(Player player) { - if(player.hasPermission("essentials.chat.bypass.cooldown")) return false; - if(ess.getConfig().getBoolean("chat.chat-cooldown-enable")){ - //if task is shutdown for some reason, recreate it - if(runable == null){ - runable = new BukkitRunnable() { - @Override - public void run() { - for(Map.Entry entry : lastMessageTimer.entrySet()){ - if(lastMessageTimer.get(entry.getKey()) == null){ - lastMessageTimer.putIfAbsent(entry.getKey(), 0); - } - lastMessageTimer.put(entry.getKey(), entry.getValue() +1); - if(entry.getValue() >= ess.getConfig().getInt("chat.chat-cooldown-time")){ - lastMessageTimer.remove(entry.getKey()); - } - } - } - }.runTaskTimer(ess, 20L, 20L); - } + if (player.hasPermission("essentials.chat.bypass.cooldown") + || !config.getBoolean("chat.chat-cooldown-enable")) { + return false; } - if (lastMessageTimer.containsKey(player.getUniqueId())) { - player.sendMessage(Color.RED + "There is currently a chat cooldown. Please wait " + lastMessage.get(player.getUniqueId()) + " seconds before sending another message."); + final long cooldownTime = config.getInt("chat.chat-cooldown-time") * 1000L; + final UUID uuid = player.getUniqueId(); + final long currentTime = System.currentTimeMillis(); + final long lastMessageTime = cooldowns.getOrDefault(uuid, 0L); + final long remaining = cooldownTime - (currentTime - lastMessageTime); + + if (remaining > 0) { + player.sendMessage(ChatColor.RED + "Please wait " + + (remaining / 1000 + 1) + + " seconds before sending another message."); return true; } + + cooldowns.put(uuid, currentTime); return false; } + public static AntiSpam getAntiSpam(){ return antiSpam; } + + public void unloadPlayer(Player player){ + lastMessage.remove(player.getUniqueId()); + cooldowns.remove(player.getUniqueId()); + } } From b6bf54f920b137e434b855a80eaaac330d79349f Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:21:47 -0600 Subject: [PATCH 35/52] Fire antispam after the AbstractChatEvent is created --- .../com/earth2me/essentials/chat/processing/ChatHandler.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java index 7304565f9c..0e7d713491 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/ChatHandler.java @@ -3,7 +3,6 @@ import com.earth2me.essentials.Essentials; import com.earth2me.essentials.chat.EssentialsChat; import net.ess3.provider.AbstractChatEvent; -import org.bukkit.event.Event; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; @@ -45,12 +44,10 @@ private final class ChatHighest implements ChatListener { @Override @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerChat(AsyncPlayerChatEvent event) { - AntiSpam.getAntiSpam().newMessage(event); final AbstractChatEvent absEvent = wrap(event); + AntiSpam.getAntiSpam().newMessage(absEvent); handleChatPostFormat(absEvent); handleChatSubmit(absEvent); - - } } } From c24864485bc59d6a516121cf02a22d92bd01bb42 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:21:58 -0600 Subject: [PATCH 36/52] Formatting --- .../earth2me/essentials/chat/processing/PaperChatHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java index 18a0da3176..36e180f4d6 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java @@ -11,6 +11,7 @@ public class PaperChatHandler extends AbstractChatHandler { public PaperChatHandler(Essentials ess, EssentialsChat essChat) { super(ess, essChat); } + public void registerListeners() { final PluginManager pm = essChat.getServer().getPluginManager(); pm.registerEvents(new ChatListener(), essChat); From 6ab4b7506e35c6a80b89cae81c4b61e8bab56212 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:22:18 -0600 Subject: [PATCH 37/52] Formatting --- .../earth2me/essentials/chat/processing/PaperChatHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java index 36e180f4d6..f0853bdfd8 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PaperChatHandler.java @@ -4,7 +4,6 @@ import com.earth2me.essentials.chat.EssentialsChat; import net.ess3.provider.AbstractChatEvent; import net.ess3.provider.providers.PaperChatListenerProvider; -import org.bukkit.event.Event; import org.bukkit.plugin.PluginManager; public class PaperChatHandler extends AbstractChatHandler { @@ -30,7 +29,7 @@ public void onChatNormal(AbstractChatEvent event) { @Override public void onChatHighest(AbstractChatEvent event) { - AntiSpam.getAntiSpam().newMessagePaper(event); + AntiSpam.getAntiSpam().newMessage(event); handleChatPostFormat(event); handleChatSubmit(event); } From 221e449f27f87873dd85412467f0dff84cb279fb Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:22:48 -0600 Subject: [PATCH 38/52] Add PlayerQuitListener to remove players from maps, releasing memory --- .../chat/processing/PlayerDisconnectListner.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PlayerDisconnectListner.java diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PlayerDisconnectListner.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PlayerDisconnectListner.java new file mode 100644 index 0000000000..39e9c4348d --- /dev/null +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/PlayerDisconnectListner.java @@ -0,0 +1,12 @@ +package com.earth2me.essentials.chat.processing; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerQuitEvent; + +public class PlayerDisconnectListner implements Listener { + @EventHandler + public void onPlayerDisconnect(PlayerQuitEvent event){ + AntiSpam.getAntiSpam().unloadPlayer(event.getPlayer()); + } +} From 10fffebe625ad752c5d5a91cc646768ed8213313 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:58:04 -0600 Subject: [PATCH 39/52] Another rebuild of newMessage, return if already canceled, change setCanceled logic --- .../essentials/chat/processing/AntiSpam.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index d5e49201c8..b30d79dad8 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -27,15 +27,27 @@ public AntiSpam() { ess.getServer().getPluginManager().registerEvents(new PlayerDisconnectListner(), ess); } - public void newMessage(AbstractChatEvent event){ + public void newMessage(AbstractChatEvent event) { + if (event.isCancelled()) { + return; + } + final Player player = event.getPlayer(); final String message = event.getMessage(); + event.setMessage(capsFilter(message, player)); - event.setCancelled( - event.isCancelled() - || duplicationFilter(message, player) - || chatCooldown(player) - ); + + if (duplicationFilter(message, player)) { + event.setCancelled(true); + return; + } + + if (chatCooldown(player)) { + event.setCancelled(true); + return; + } + + lastMessage.put(player.getUniqueId(), message.toLowerCase(Locale.ROOT)); } private String capsFilter(String message, Player player) { From 4109b7de282a5d0f97304e97cdcf6c5ca8bcdca7 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:58:21 -0600 Subject: [PATCH 40/52] Constructor for tests --- .../com/earth2me/essentials/chat/processing/AntiSpam.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index b30d79dad8..0e63203247 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -13,13 +13,18 @@ public class AntiSpam { private static AntiSpam antiSpam; - private final Essentials ess = Essentials.getPlugin(Essentials.class); + private final Essentials ess; private final FileConfiguration config; private final Map lastMessage; private final Map cooldowns; public AntiSpam() { + this(Essentials.getPlugin(Essentials.class)); + } + + public AntiSpam(Essentials ess) { + this.ess = ess; antiSpam = this; config = ess.getConfig(); lastMessage = new ConcurrentHashMap<>(); From 408050ee4dfe66329006050b875320086e519b1b Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:59:25 -0600 Subject: [PATCH 41/52] Assign the lastMessage once --- .../java/com/earth2me/essentials/chat/processing/AntiSpam.java | 1 - 1 file changed, 1 deletion(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 0e63203247..0e3312770e 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -104,7 +104,6 @@ private boolean duplicationFilter(String message, Player player) { player.sendMessage(ChatColor.RED + "Please do not send the same message twice."); return true; } - lastMessage.put(uuid, normalizedMessage); return false; } From aa4699e597c53328dead6f4e89637cab96fbb6c3 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 18:59:38 -0600 Subject: [PATCH 42/52] Added tests for antispam filters and cooldown --- EssentialsChat/build.gradle | 6 +- .../chat/processing/AntiSpamTests.java | 290 ++++++++++++++++++ 2 files changed, 295 insertions(+), 1 deletion(-) create mode 100644 EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java diff --git a/EssentialsChat/build.gradle b/EssentialsChat/build.gradle index e0b9454d23..e2ad7d7ad2 100644 --- a/EssentialsChat/build.gradle +++ b/EssentialsChat/build.gradle @@ -4,4 +4,8 @@ plugins { dependencies { compileOnly project(':EssentialsX') -} + testImplementation project(':EssentialsX') + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' +} \ No newline at end of file diff --git a/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java b/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java new file mode 100644 index 0000000000..89cb5de23c --- /dev/null +++ b/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java @@ -0,0 +1,290 @@ +package com.earth2me.essentials.chat.processing; + +import com.earth2me.essentials.Essentials; +import net.ess3.provider.AbstractChatEvent; +import org.bukkit.Server; +import org.bukkit.command.ConsoleCommandSender; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.entity.Player; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.UUID; + +import static org.mockito.ArgumentMatchers.contains; +import static org.mockito.Mockito.*; + +class AntiSpamTests { + + private Essentials ess; + private FileConfiguration config; + private Server server; + private ConsoleCommandSender console; + private Player player; + private AntiSpam antiSpam; + + @BeforeEach + void setUp() { + ess = mock(Essentials.class); + config = mock(FileConfiguration.class); + server = mock(Server.class); + console = mock(ConsoleCommandSender.class); + player = mock(Player.class); + + when(ess.getConfig()).thenReturn(config); + when(ess.getServer()).thenReturn(server); + when(server.getConsoleSender()).thenReturn(console); + + // Default configuration + when(config.getBoolean("chat.chat-caps-filter")).thenReturn(false); + when(config.getBoolean("chat.duplicate-prevention")).thenReturn(true); + when(config.getBoolean("chat.chat-cooldown-enable")).thenReturn(false); + when(config.getInt("chat.chat-cooldown-time")).thenReturn(5); + + // Player configuration + when(player.getUniqueId()).thenReturn(UUID.randomUUID()); + when(player.getName()).thenReturn("TestPlayer"); + when(player.hasPermission("essentials.chat.bypass.cooldown")).thenReturn(false); + + antiSpam = new AntiSpam(ess); + } + + private AbstractChatEvent createEvent(String message) { + AbstractChatEvent event = mock(AbstractChatEvent.class); + + when(event.getPlayer()).thenReturn(player); + when(event.getMessage()).thenReturn(message); + when(event.isCancelled()).thenReturn(false); + + return event; + } + + + private void assertMessageCancelled(String message, boolean cancelled) { + AbstractChatEvent event = createEvent(message); + + antiSpam.newMessage(event); + + if (cancelled) { + verify(event).setCancelled(true); + } else { + verify(event, never()).setCancelled(true); + } + } + + // Duplicate prevention + + @Test + void firstMessageShouldBeAllowed() { + assertMessageCancelled("Hello everyone", false); + } + + @Test + void identicalMessageShouldBeCancelled() { + assertMessageCancelled("Hello everyone", false); + assertMessageCancelled("Hello everyone", true); + } + + @Test + void duplicateMessageShouldIgnoreCapitalization() { + assertMessageCancelled("Hello Everyone", false); + assertMessageCancelled("HELLO EVERYONE", true); + } + + @Test + void messageStartingWithPreviousMessageShouldBeCancelled() { + assertMessageCancelled("Hello everyone", false); + assertMessageCancelled("Hello", true); + } + + @Test + void messageEndingWithPreviousMessageShouldBeCancelled() { + assertMessageCancelled("Hello everyone", false); + assertMessageCancelled("everyone", true); + } + + @Test + void differentMessageShouldBeAllowed() { + assertMessageCancelled("Hello", false); + assertMessageCancelled("Goodbye", false); + } + + @Test + void duplicatePreventionDisabledShouldAllowDuplicates() { + when(config.getBoolean("chat.duplicate-prevention")).thenReturn(false); + + assertMessageCancelled("Hello", false); + assertMessageCancelled("Hello", false); + } + + // Chat cooldown + + @Test + void firstMessageShouldNotTriggerCooldown() { + when(config.getBoolean("chat.chat-cooldown-enable")).thenReturn(true); + + assertMessageCancelled("Hello", false); + } + + @Test + void secondMessageDuringCooldownShouldBeCancelled() { + when(config.getBoolean("chat.chat-cooldown-enable")).thenReturn(true); + + assertMessageCancelled("Hello", false); + assertMessageCancelled("Goodbye", true); + } + + @Test + void cooldownBypassPermissionShouldAllowMessages() { + when(config.getBoolean("chat.chat-cooldown-enable")).thenReturn(true); + when(player.hasPermission("essentials.chat.bypass.cooldown")).thenReturn(true); + + assertMessageCancelled("Hello", false); + assertMessageCancelled("Goodbye", false); + } + + @Test + void disabledCooldownShouldAllowMessages() { + when(config.getBoolean("chat.chat-cooldown-enable")).thenReturn(false); + + assertMessageCancelled("Hello", false); + assertMessageCancelled("Goodbye", false); + } + + @Test + void cooldownRejectedMessageShouldNotReplaceLastAcceptedMessage() { + when(config.getBoolean("chat.chat-cooldown-enable")).thenReturn(true); + + // First message is accepted. + assertMessageCancelled("First message", false); + + // Second message is rejected by cooldown. + assertMessageCancelled("Second message", true); + + // Bypass cooldown to isolate duplicate detection. + when(player.hasPermission("essentials.chat.bypass.cooldown")).thenReturn(true); + + // The original accepted message should still be recognized as a duplicate. + assertMessageCancelled("First message", true); + } + + // Caps filter + + @Test + void excessiveCapitalizationShouldBeConvertedToLowercase() { + when(config.getBoolean("chat.chat-caps-filter")).thenReturn(true); + + AbstractChatEvent event = createEvent("HELLO"); + + antiSpam.newMessage(event); + + verify(event).setMessage("hello"); + } + + @Test + void normalCapitalizationShouldRemainUnchanged() { + when(config.getBoolean("chat.chat-caps-filter")).thenReturn(true); + + AbstractChatEvent event = createEvent("Hello everyone"); + + antiSpam.newMessage(event); + + verify(event).setMessage("Hello everyone"); + } + + @Test + void disabledCapsFilterShouldLeaveMessageUnchanged() { + AbstractChatEvent event = createEvent("HELLO"); + + antiSpam.newMessage(event); + + verify(event).setMessage("HELLO"); + } + + @Test + void capsFilterShouldSendWarning() { + when(config.getBoolean("chat.chat-caps-filter")).thenReturn(true); + + antiSpam.newMessage(createEvent("HELLO")); + + verify(player).sendMessage(contains("capital letters")); + } + + @Test + void capsPunishmentShouldReplacePlayerPlaceholder() { + when(config.getBoolean("chat.chat-caps-filter")).thenReturn(true); + when(config.getString("caps-punish")).thenReturn("mute {player} 10m"); + + antiSpam.newMessage(createEvent("HELLO")); + + verify(server).dispatchCommand(console, "mute TestPlayer 10m"); + } + + @Test + void emptyCapsPunishmentShouldNotDispatchCommand() { + when(config.getBoolean("chat.chat-caps-filter")).thenReturn(true); + when(config.getString("caps-punish")).thenReturn(" "); + + antiSpam.newMessage(createEvent("HELLO")); + + verifyNoInteractions(server); + } + + // Duplicate punishment + + @Test + void duplicatePunishmentShouldReplacePlayerPlaceholder() { + when(config.getString("duplication-punish")).thenReturn("mute {player} 10m"); + + assertMessageCancelled("Hello", false); + assertMessageCancelled("Hello", true); + + verify(server).dispatchCommand(console, "mute TestPlayer 10m"); + } + + @Test + void emptyDuplicatePunishmentShouldNotDispatchCommand() { + when(config.getString("duplication-punish")).thenReturn(""); + + assertMessageCancelled("Hello", false); + assertMessageCancelled("Hello", true); + + verifyNoInteractions(server); + } + + // Event handling + + @Test + void alreadyCancelledEventShouldRemainCancelled() { + AbstractChatEvent event = createEvent("Hello"); + when(event.isCancelled()).thenReturn(true); + + antiSpam.newMessage(event); + + verify(event, never()).setCancelled(false); + verify(event, never()).setCancelled(true); + } + + // Player cleanup + + @Test + void unloadPlayerShouldClearDuplicateHistory() { + assertMessageCancelled("Hello", false); + + antiSpam.unloadPlayer(player); + + assertMessageCancelled("Hello", false); + } + + @Test + void unloadPlayerShouldClearCooldownHistory() { + when(config.getBoolean("chat.chat-cooldown-enable")).thenReturn(true); + + assertMessageCancelled("Hello", false); + + antiSpam.unloadPlayer(player); + + // The same message should be accepted after cleanup. + assertMessageCancelled("Hello", false); + } +} From 7f3ff86439765f16ee9833ac73a7d71dc1c7163a Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 19:14:07 -0600 Subject: [PATCH 43/52] Register listener in the plugin class --- .../java/com/earth2me/essentials/chat/EssentialsChat.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChat.java index d734310353..7b136d39dc 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChat.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/EssentialsChat.java @@ -5,6 +5,7 @@ import com.earth2me.essentials.chat.processing.AntiSpam; import com.earth2me.essentials.chat.processing.ChatHandler; import com.earth2me.essentials.chat.processing.PaperChatHandler; +import com.earth2me.essentials.chat.processing.PlayerDisconnectListner; import com.earth2me.essentials.metrics.MetricsWrapper; import com.earth2me.essentials.utils.VersionUtil; import net.ess3.api.IEssentials; @@ -20,7 +21,7 @@ public class EssentialsChat extends JavaPlugin { private transient IEssentials ess; private transient MetricsWrapper metrics = null; - public transient AntiSpam antiSpam = new AntiSpam(); + public transient AntiSpam antiSpam; @Override public void onEnable() { @@ -46,6 +47,8 @@ public void onEnable() { if (metrics == null) { metrics = new MetricsWrapper(this, 3814, false); } + antiSpam = new AntiSpam(ess); + pluginManager.registerEvents(new PlayerDisconnectListner(), this); } @Override From 47ca925cd2000fb841f0d4a384d481b33176a830 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 19:14:25 -0600 Subject: [PATCH 44/52] Make events final --- .../essentials/chat/processing/AntiSpamTests.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java b/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java index 89cb5de23c..9fe4a31431 100644 --- a/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java +++ b/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java @@ -50,7 +50,7 @@ void setUp() { } private AbstractChatEvent createEvent(String message) { - AbstractChatEvent event = mock(AbstractChatEvent.class); + final AbstractChatEvent event = mock(AbstractChatEvent.class); when(event.getPlayer()).thenReturn(player); when(event.getMessage()).thenReturn(message); @@ -61,7 +61,7 @@ private AbstractChatEvent createEvent(String message) { private void assertMessageCancelled(String message, boolean cancelled) { - AbstractChatEvent event = createEvent(message); + final AbstractChatEvent event = createEvent(message); antiSpam.newMessage(event); @@ -174,7 +174,7 @@ void cooldownRejectedMessageShouldNotReplaceLastAcceptedMessage() { void excessiveCapitalizationShouldBeConvertedToLowercase() { when(config.getBoolean("chat.chat-caps-filter")).thenReturn(true); - AbstractChatEvent event = createEvent("HELLO"); + final AbstractChatEvent event = createEvent("HELLO"); antiSpam.newMessage(event); @@ -185,7 +185,7 @@ void excessiveCapitalizationShouldBeConvertedToLowercase() { void normalCapitalizationShouldRemainUnchanged() { when(config.getBoolean("chat.chat-caps-filter")).thenReturn(true); - AbstractChatEvent event = createEvent("Hello everyone"); + final AbstractChatEvent event = createEvent("Hello everyone"); antiSpam.newMessage(event); @@ -194,7 +194,7 @@ void normalCapitalizationShouldRemainUnchanged() { @Test void disabledCapsFilterShouldLeaveMessageUnchanged() { - AbstractChatEvent event = createEvent("HELLO"); + final AbstractChatEvent event = createEvent("HELLO"); antiSpam.newMessage(event); @@ -256,7 +256,7 @@ void emptyDuplicatePunishmentShouldNotDispatchCommand() { @Test void alreadyCancelledEventShouldRemainCancelled() { - AbstractChatEvent event = createEvent("Hello"); + final AbstractChatEvent event = createEvent("Hello"); when(event.isCancelled()).thenReturn(true); antiSpam.newMessage(event); From a47b45d76dad0e9162cdf2f93a8778bccdc3c55a Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 19:14:43 -0600 Subject: [PATCH 45/52] Correct constructor issue --- .../earth2me/essentials/chat/processing/AntiSpam.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 0e3312770e..2f49d7d472 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.chat.processing; -import com.earth2me.essentials.Essentials; +import com.earth2me.essentials.IEssentials; import net.ess3.provider.AbstractChatEvent; import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; @@ -13,23 +13,18 @@ public class AntiSpam { private static AntiSpam antiSpam; - private final Essentials ess; + private final IEssentials ess; private final FileConfiguration config; private final Map lastMessage; private final Map cooldowns; - public AntiSpam() { - this(Essentials.getPlugin(Essentials.class)); - } - - public AntiSpam(Essentials ess) { + public AntiSpam(IEssentials ess) { this.ess = ess; antiSpam = this; config = ess.getConfig(); lastMessage = new ConcurrentHashMap<>(); cooldowns = new ConcurrentHashMap<>(); - ess.getServer().getPluginManager().registerEvents(new PlayerDisconnectListner(), ess); } public void newMessage(AbstractChatEvent event) { From 1ed655e293da1105260b05babfdb2d816a998a7c Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 19:22:46 -0600 Subject: [PATCH 46/52] Corrected tests to support the new comparison for duplication filters --- .../chat/processing/AntiSpamTests.java | 59 ++++++++++++++----- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java b/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java index 9fe4a31431..e11887a8f6 100644 --- a/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java +++ b/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java @@ -35,13 +35,11 @@ void setUp() { when(ess.getServer()).thenReturn(server); when(server.getConsoleSender()).thenReturn(console); - // Default configuration when(config.getBoolean("chat.chat-caps-filter")).thenReturn(false); when(config.getBoolean("chat.duplicate-prevention")).thenReturn(true); when(config.getBoolean("chat.chat-cooldown-enable")).thenReturn(false); when(config.getInt("chat.chat-cooldown-time")).thenReturn(5); - // Player configuration when(player.getUniqueId()).thenReturn(UUID.randomUUID()); when(player.getName()).thenReturn("TestPlayer"); when(player.hasPermission("essentials.chat.bypass.cooldown")).thenReturn(false); @@ -59,7 +57,6 @@ private AbstractChatEvent createEvent(String message) { return event; } - private void assertMessageCancelled(String message, boolean cancelled) { final AbstractChatEvent event = createEvent(message); @@ -92,21 +89,57 @@ void duplicateMessageShouldIgnoreCapitalization() { } @Test - void messageStartingWithPreviousMessageShouldBeCancelled() { + void similarMessageWithOneCharacterChangedShouldBeCancelled() { assertMessageCancelled("Hello everyone", false); - assertMessageCancelled("Hello", true); + assertMessageCancelled("Hello everyonf", true); } @Test - void messageEndingWithPreviousMessageShouldBeCancelled() { + void similarMessageWithCharacterInsertedShouldBeCancelled() { + assertMessageCancelled("buy cheap diamonds", false); + assertMessageCancelled("buy cheap diamondss", true); + } + + @Test + void similarMessageWithCharacterRemovedShouldBeCancelled() { + assertMessageCancelled("buy cheap diamondss", false); + assertMessageCancelled("buy cheap diamonds", true); + } + + @Test + void similarMessageWithCharacterSubstitutedShouldBeCancelled() { assertMessageCancelled("Hello everyone", false); - assertMessageCancelled("everyone", true); + assertMessageCancelled("Hello evetyone", true); } @Test - void differentMessageShouldBeAllowed() { + void messageStartingWithPreviousMessageShouldBeAllowed() { assertMessageCancelled("Hello", false); - assertMessageCancelled("Goodbye", false); + assertMessageCancelled("Hello everyone", false); + } + + @Test + void messageEndingWithPreviousMessageShouldBeAllowed() { + assertMessageCancelled("everyone", false); + assertMessageCancelled("Hello everyone", false); + } + + @Test + void completelyDifferentMessageShouldBeAllowed() { + assertMessageCancelled("Hello everyone", false); + assertMessageCancelled("Goodbye world", false); + } + + @Test + void similarityExactlyAtThresholdShouldBeCancelled() { + assertMessageCancelled("abcdefghijklmnopqrst", false); + assertMessageCancelled("abcXXXghijklmnopqrst", true); + } + + @Test + void similarityBelowThresholdShouldBeAllowed() { + assertMessageCancelled("abcdefghijklmnopqrst", false); + assertMessageCancelled("abcdXXXXijklmnopqrst", false); } @Test @@ -155,16 +188,11 @@ void disabledCooldownShouldAllowMessages() { void cooldownRejectedMessageShouldNotReplaceLastAcceptedMessage() { when(config.getBoolean("chat.chat-cooldown-enable")).thenReturn(true); - // First message is accepted. assertMessageCancelled("First message", false); - - // Second message is rejected by cooldown. assertMessageCancelled("Second message", true); - // Bypass cooldown to isolate duplicate detection. when(player.hasPermission("essentials.chat.bypass.cooldown")).thenReturn(true); - // The original accepted message should still be recognized as a duplicate. assertMessageCancelled("First message", true); } @@ -284,7 +312,6 @@ void unloadPlayerShouldClearCooldownHistory() { antiSpam.unloadPlayer(player); - // The same message should be accepted after cleanup. assertMessageCancelled("Hello", false); } -} +} \ No newline at end of file From c04bfdfbf6b39d91ace31d2b0f088b14a07e84f1 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 19:23:25 -0600 Subject: [PATCH 47/52] Used levenshteinDistance to calculate how similar the new message is to the previous one. This is really cool in my opinion and I used AI to help determine the right way to code this --- .../essentials/chat/processing/AntiSpam.java | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 2f49d7d472..baf13d3958 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -87,8 +87,7 @@ private boolean duplicationFilter(String message, Player player) { if (previousMessage != null && (previousMessage.equals(normalizedMessage) - || previousMessage.startsWith(normalizedMessage) - || previousMessage.endsWith(normalizedMessage))) { + || similarity(previousMessage, normalizedMessage) >= 0.85)) { final String command = config.getString("duplication-punish"); if (command != null && !command.trim().isEmpty()) { ess.getServer().dispatchCommand( @@ -101,6 +100,16 @@ private boolean duplicationFilter(String message, Player player) { } return false; } + private double similarity(String a, String b) { + if (a.equals(b)) { + return 1.0; + } + + final int distance = levenshteinDistance(a, b); + final int maxLength = Math.max(a.length(), b.length()); + + return maxLength == 0 ? 1.0 : 1.0 - (double) distance / maxLength; + } private boolean chatCooldown(Player player) { if (player.hasPermission("essentials.chat.bypass.cooldown") @@ -132,4 +141,29 @@ public void unloadPlayer(Player player){ lastMessage.remove(player.getUniqueId()); cooldowns.remove(player.getUniqueId()); } + private int levenshteinDistance(String a, String b) { + int[] costs = new int[b.length() + 1]; + + for (int j = 0; j <= b.length(); j++) { + costs[j] = j; + } + + for (int i = 1; i <= a.length(); i++) { + costs[0] = i; + int previousCost = i - 1; + + for (int j = 1; j <= b.length(); j++) { + int currentCost = costs[j]; + + costs[j] = Math.min( + Math.min(costs[j] + 1, costs[j - 1] + 1), + previousCost + (a.charAt(i - 1) == b.charAt(j - 1) ? 0 : 1) + ); + + previousCost = currentCost; + } + } + + return costs[b.length()]; + } } From 00792bad65aba545886743c5cfa9444c9667ad00 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 19:31:56 -0600 Subject: [PATCH 48/52] Formatting and imports --- .../com/earth2me/essentials/chat/processing/AntiSpam.java | 6 ++++-- .../essentials/chat/processing/AntiSpamTests.java | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index baf13d3958..d413cff681 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -100,6 +100,7 @@ private boolean duplicationFilter(String message, Player player) { } return false; } + private double similarity(String a, String b) { if (a.equals(b)) { return 1.0; @@ -141,8 +142,9 @@ public void unloadPlayer(Player player){ lastMessage.remove(player.getUniqueId()); cooldowns.remove(player.getUniqueId()); } + private int levenshteinDistance(String a, String b) { - int[] costs = new int[b.length() + 1]; + final int[] costs = new int[b.length() + 1]; for (int j = 0; j <= b.length(); j++) { costs[j] = j; @@ -153,7 +155,7 @@ private int levenshteinDistance(String a, String b) { int previousCost = i - 1; for (int j = 1; j <= b.length(); j++) { - int currentCost = costs[j]; + final int currentCost = costs[j]; costs[j] = Math.min( Math.min(costs[j] + 1, costs[j - 1] + 1), diff --git a/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java b/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java index e11887a8f6..9618b2d7ce 100644 --- a/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java +++ b/EssentialsChat/src/test/java/com/earth2me/essentials/chat/processing/AntiSpamTests.java @@ -12,7 +12,11 @@ import java.util.UUID; import static org.mockito.ArgumentMatchers.contains; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; class AntiSpamTests { @@ -314,4 +318,4 @@ void unloadPlayerShouldClearCooldownHistory() { assertMessageCancelled("Hello", false); } -} \ No newline at end of file +} From cab0498b5436b76ba2626a679a064b568c461809 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 19:32:14 -0600 Subject: [PATCH 49/52] Add mention of using {player} in the punish command --- Essentials/src/main/resources/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Essentials/src/main/resources/config.yml b/Essentials/src/main/resources/config.yml index a8b37bfdde..0f693511a0 100644 --- a/Essentials/src/main/resources/config.yml +++ b/Essentials/src/main/resources/config.yml @@ -1050,6 +1050,7 @@ chat: duplicate-prevention: true #Whether we run a command in response to duplicate messages. Leave empty for no punishment. + #Use {player} to insert the player that triggered this punishment duplicate-punish: #Whether chat should have a cooldown per player. @@ -1061,6 +1062,7 @@ chat: #Whether messages containing lots of capitols should be changed to lowercase chat-caps-filter: true + #Use {player} to insert the player that triggered this punishment #Whether we run a command in response to too many capitol letters. Leave empty for no punishment. caps-punishment: From ef3366f35a59cff134c2433e1283aecb37ac562b Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 19:39:08 -0600 Subject: [PATCH 50/52] Add isSimilar to also check for shorter similar messages --- .../essentials/chat/processing/AntiSpam.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index d413cff681..92c461e638 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -85,9 +85,7 @@ private boolean duplicationFilter(String message, Player player) { final String normalizedMessage = message.toLowerCase(Locale.ROOT); final String previousMessage = lastMessage.get(uuid); - if (previousMessage != null - && (previousMessage.equals(normalizedMessage) - || similarity(previousMessage, normalizedMessage) >= 0.85)) { + if (previousMessage != null && isSimilar(previousMessage, normalizedMessage)) { final String command = config.getString("duplication-punish"); if (command != null && !command.trim().isEmpty()) { ess.getServer().dispatchCommand( @@ -168,4 +166,15 @@ private int levenshteinDistance(String a, String b) { return costs[b.length()]; } + private boolean isSimilar(String a, String b) { + if (a.equals(b)) { + return true; + } + + final int distance = levenshteinDistance(a, b); + final int maxLength = Math.max(a.length(), b.length()); + + return distance <= 1 + || 1.0 - (double) distance / maxLength >= 0.85; + } } From 5983b18ee66fc4dd3f0ba9a9d4ae36d17bee4f2d Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 19:39:39 -0600 Subject: [PATCH 51/52] Formatting --- .../java/com/earth2me/essentials/chat/processing/AntiSpam.java | 1 + 1 file changed, 1 insertion(+) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 92c461e638..895ce8baff 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -166,6 +166,7 @@ private int levenshteinDistance(String a, String b) { return costs[b.length()]; } + private boolean isSimilar(String a, String b) { if (a.equals(b)) { return true; From c46f30f506fdab64012d4a4b43ef4e0483eeb9a0 Mon Sep 17 00:00:00 2001 From: MochaMilkie Date: Thu, 12 Nov 2026 19:42:45 -0600 Subject: [PATCH 52/52] Remove unused method --- .../earth2me/essentials/chat/processing/AntiSpam.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java index 895ce8baff..1fb7a5faf8 100644 --- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java +++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AntiSpam.java @@ -99,17 +99,6 @@ private boolean duplicationFilter(String message, Player player) { return false; } - private double similarity(String a, String b) { - if (a.equals(b)) { - return 1.0; - } - - final int distance = levenshteinDistance(a, b); - final int maxLength = Math.max(a.length(), b.length()); - - return maxLength == 0 ? 1.0 : 1.0 - (double) distance / maxLength; - } - private boolean chatCooldown(Player player) { if (player.hasPermission("essentials.chat.bypass.cooldown") || !config.getBoolean("chat.chat-cooldown-enable")) {