fix: 🐛 fix message last arg does not greedy

AnzhiZhang · Dec 17, 2022 · 315c5bc · 315c5bc
1 parent a64da47
commit 315c5bc
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/com/zhanganzhi/chathub/command/Command.java b/src/main/java/com/zhanganzhi/chathub/command/Command.java
@@ -1,6 +1,7 @@
 package com.zhanganzhi.chathub.command;
 
 import java.util.List;
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -38,12 +39,13 @@ public void execute(final Invocation invocation) {
                     ));
                 }
             }
-        } else if (args.length == 3 && args[0].equals("msg")) {
+        } else if (args.length >= 3 && args[0].equals("msg")) {
             Optional<Player> optionalPlayer = server.getPlayer(args[1]);
             if (optionalPlayer.isPresent()) {
                 String senderName = source instanceof Player ? ((Player) source).getUsername() : "Server";
-                source.sendMessage(Component.text(config.getMinecraftMsgSenderMessage(args[1], args[2])));
-                optionalPlayer.get().sendMessage(Component.text(config.getMinecraftMsgTargetMessage(senderName, args[2])));
+                String message = String.join(" ", Arrays.copyOfRange(args, 2, args.length));
+                source.sendMessage(Component.text(config.getMinecraftMsgSenderMessage(args[1], message)));
+                optionalPlayer.get().sendMessage(Component.text(config.getMinecraftMsgTargetMessage(senderName, message)));
             } else {
                 source.sendMessage(Component.text("Player \"" + args[1] + "\" does not online!"));
             }