e

Author: ThatPotatoDev

PotatoEssentials/src/main/java/com/mcdragonmasters/potatoessentials/PotatoEssentials.java

@@ -134,7 +134,8 @@ private void registerCommands() {
         //noinspection ConstantValue
         if (genDocs) {
             File file = new File(PotatoEssentials.INSTANCE.getDataFolder(), "commands-docs.md");
-            if (file.exists()) file.delete();
+            if (file.exists()) //noinspection ResultOfMethodCallIgnored
+                file.delete();
             List<PotatoCommand> commands = new ArrayList<>(registrar.getRegisteredCommands());
             commands.addAll(registrar.getUnregisteredCommands());
             try (FileWriter fileWriter = new FileWriter(file); BufferedWriter writer = new BufferedWriter(fileWriter)) {

PotatoEssentials/src/main/java/com/mcdragonmasters/potatoessentials/api/event/ChatCooldownEvent.java

@@ -21,13 +21,20 @@ public class ChatCooldownEvent extends PlayerEvent {
     private final String channel;
     @Getter
     private final double remainingSeconds;
+    private boolean shouldSendMessage = true;
 
-    public ChatCooldownEvent(@NotNull Player player, Component message, double remainingSeconds, String channel) {
-        super(player);
+    public ChatCooldownEvent(@NotNull Player player, Component message, double remainingSeconds, String channel, boolean async) {
+        super(player, async);
         this.message = message;
         this.channel = channel;
         this.remainingSeconds = remainingSeconds;
     }
+    public boolean shouldSendMessage() {
+        return shouldSendMessage;
+    }
+    public void shouldSendMessage(boolean shouldSendMessage) {
+        this.shouldSendMessage = shouldSendMessage;
+    }
     @Override
     public @NotNull HandlerList getHandlers() {
         return handlers;

PotatoEssentials/src/main/java/com/mcdragonmasters/potatoessentials/listeners/ChatListener.java

@@ -47,9 +47,9 @@ public void onPlayerChat(AsyncChatEvent e) {
                 double cooldownRemainder = cooldownRemainderMillis / 1000D;
                 var msg = Config.replaceFormat(Config.getString("chat.cooldownMessage"),
                         new Replacer("cooldown", df.format(cooldownRemainder)));
-                var event = new ChatCooldownEvent(player, msg, cooldownRemainder,"global");
+                var event = new ChatCooldownEvent(player, msg, cooldownRemainder,"global", e.isAsynchronous());
                 Bukkit.getPluginManager().callEvent(event);
-                player.sendMessage(msg);
+                if (event.shouldSendMessage()) player.sendMessage(msg);
                 return;
             }
         }
@@ -66,7 +66,7 @@ public void onPlayerChat(AsyncChatEvent e) {
                 new Replacer("message", message, false));
         Map<Player, CustomChat> playerChatMap = CustomChat.getPlayerChat();
         if (Config.customChatsEnabled() && playerChatMap.containsKey(player)) {
-            playerChatMap.get(player).sendMessage(player, message);
+            playerChatMap.get(player).sendMessage(player, message, e.isAsynchronous());
             return;
         }
         Bukkit.broadcast(finalMessage);

PotatoEssentials/src/main/java/com/mcdragonmasters/potatoessentials/objects/CustomChat.java

@@ -37,7 +37,7 @@ public class CustomChat {
     private final @Nullable String command;
     private final @Nullable Integer cooldown;
     @Getter
-    private final HashMap<CommandSender, Long> lastChatTimes = new HashMap<>();
+    private final HashMap<Player, Long> lastChatTimes = new HashMap<>();
 
     public CustomChat(String key, String name, @Nullable String permission, @Nullable String command, @Nullable Integer cooldown) {
         this.key = key;
@@ -80,11 +80,11 @@ public CustomChat(String key, String name, @Nullable String permission, @Nullabl
         if (permission!=null) cmd.withPermission(permission);
         cmd.register("potatoessentialschannel");
     }
-    public void sendMessage(CommandSender sender, String message) {
-        if (this.getCooldown()!=null) {
-            boolean canBypassCooldown = sender.hasPermission(PotatoEssentials.NAMESPACE+".chat.bypass-cooldown");
-            if (this.getLastChatTimes().containsKey(sender) && !canBypassCooldown) {
-                long lastTime = this.getLastChatTimes().get(sender);
+    public void sendMessage(CommandSender sender, String message, boolean async) {
+        if (sender instanceof Player p && this.getCooldown()!=null) {
+            boolean canBypassCooldown = p.hasPermission(PotatoEssentials.NAMESPACE+".chat.bypass-cooldown");
+            if (this.getLastChatTimes().containsKey(p) && !canBypassCooldown) {
+                long lastTime = this.getLastChatTimes().get(p);
                 long currentTime = System.currentTimeMillis();
                 long cooldownMillis = this.getCooldown() * 1000L;
                 long timeElapsed = currentTime - lastTime;
@@ -95,13 +95,13 @@ public void sendMessage(CommandSender sender, String message) {
                     double cooldownRemainder = cooldownRemainderMillis / 1000D;
                     var msg = Config.replaceFormat(Config.getString("chat.cooldownMessage"),
                             new Replacer("cooldown", df.format(cooldownRemainder)));
-                    var event = new ChatCooldownEvent((Player) sender, msg, cooldownRemainder, this.getKey());
+                    var event = new ChatCooldownEvent(p, msg, cooldownRemainder, this.getKey(), async);
                     Bukkit.getPluginManager().callEvent(event);
-                    sender.sendMessage(msg);
+                    if (event.shouldSendMessage()) p.sendMessage(msg);
                     return;
                 }
             }
-            this.getLastChatTimes().put(sender, System.currentTimeMillis());
+            this.getLastChatTimes().put(p, System.currentTimeMillis());
         }
         boolean miniMsg = sender.hasPermission(PotatoEssentials.NAMESPACE+".chat.minimessage");
         if (!miniMsg) message = Utils.escapeTags(message);
@@ -122,6 +122,9 @@ public void sendMessage(CommandSender sender, String message) {
         recipients.forEach(p -> p.sendMessage(msg));
         Bukkit.getConsoleSender().sendMessage(msg);
     }
+    public void sendMessage(CommandSender sender, String message) {
+        sendMessage(sender, message, false);
+    }
     public boolean checkPerm(CommandSender sender) {
         return this.getPermission() == null || sender.hasPermission(this.getPermission());
     }