CommandTell: fix duplicated messages

Flectone · Dec 3, 2023 · 71895fa · 71895fa
1 parent 7c07333
commit 71895fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/net/flectone/chat/module/FCommand.java b/src/main/java/net/flectone/chat/module/FCommand.java
@@ -1,6 +1,7 @@
 package net.flectone.chat.module;
 
 import lombok.Getter;
+import lombok.Setter;
 import net.flectone.chat.FlectoneChat;
 import net.flectone.chat.builder.MessageBuilder;
 import net.flectone.chat.database.sqlite.Database;
@@ -42,6 +43,9 @@ public abstract class FCommand implements CommandExecutor, TabCompleter, FAction
     private final String name;
     private Command command;
 
+    @Setter
+    private boolean isSilent;
+
     protected final FlectoneChat plugin;
     protected final FPlayerManager playerManager;
     protected final FModuleManager moduleManager;
@@ -150,12 +154,14 @@ public void sendGlobalMessage(@NotNull Collection<Player> recipients, @Nullable
                                   @Nullable ItemStack itemStack, @NotNull String format,
                                   @NotNull String message, boolean isClickable) {
 
-        FPlayer.sendToConsole(format
-                .replace("<message>", message)
-                .replace("<player>", player != null ? player.getName() : "CONSOLE"));
-
         if (player != null) {
             message = IntegrationsModule.interactiveChatMark(message, player.getUniqueId());
+        }
+
+        if (!isSilent) {
+            FPlayer.sendToConsole(format
+                    .replace("<message>", message)
+                    .replace("<player>", player != null ? player.getName() : "CONSOLE"));
             sendToSpy(player, recipients, CommandSpy.Type.DEFAULT, message);
         }
 

diff --git a/src/main/java/net/flectone/chat/module/commands/CommandTell.java b/src/main/java/net/flectone/chat/module/commands/CommandTell.java
@@ -111,6 +111,8 @@ public void asyncOnCommand(@NotNull CommandSender commandSender, @NotNull Comman
         sendGlobalMessage(new ArrayList<>(List.of(fReceiver.getPlayer())), cmdSettings.getSender(),
                 cmdSettings.getItemStack(), getMessage, message, true);
 
+        setSilent(true);
+
         String sendMessage = locale.getVaultString(cmdSettings.getSender(), this + ".send");
         sendMessage = MessageUtil.formatPlayerString(fReceiver.getPlayer(), sendMessage);