Remove 'geyser' from parameters when executing a command under Spigot…

…, Bungeecord, Sponge, Velocity (#1266) * Remove 'geyser' from parameters when executing a command under Spigot, Bungeecode, Sponge, Velocity Fixes bundabrg/GeyserReversion#8 * Fix case when there are no sub commands Co-authored-by: bundabrg <[email protected]>
GeyserMC · Sep 29, 2020 · 650c02e · 650c02e
1 parent 3650321
commit 650c02e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/...d/src/main/java/org/geysermc/platform/bungeecord/command/GeyserBungeeCommandExecutor.java b/...d/src/main/java/org/geysermc/platform/bungeecord/command/GeyserBungeeCommandExecutor.java
@@ -64,10 +64,10 @@ public void execute(CommandSender sender, String[] args) {
                     sender.sendMessage(TextComponent.fromLegacyText(ChatColor.RED + message));
                     return;
                 }
-                getCommand(args[0]).execute(new BungeeCommandSender(sender), args);
+                getCommand(args[0]).execute(new BungeeCommandSender(sender), args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[0]);
             }
         } else {
-            getCommand("help").execute(new BungeeCommandSender(sender), args);
+            getCommand("help").execute(new BungeeCommandSender(sender), new String[0]);
         }
     }
 

diff --git a/...pigot/src/main/java/org/geysermc/platform/spigot/command/GeyserSpigotCommandExecutor.java b/...pigot/src/main/java/org/geysermc/platform/spigot/command/GeyserSpigotCommandExecutor.java
@@ -59,11 +59,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                     sender.sendMessage(ChatColor.RED + message);
                     return true;
                 }
-                getCommand(args[0]).execute(new SpigotCommandSender(sender), args);
+                getCommand(args[0]).execute(new SpigotCommandSender(sender), args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[0]);
                 return true;
             }
         } else {
-            getCommand("help").execute(new SpigotCommandSender(sender), args);
+            getCommand("help").execute(new SpigotCommandSender(sender), new String[0]);
             return true;
         }
         return true;

diff --git a/...ponge/src/main/java/org/geysermc/platform/sponge/command/GeyserSpongeCommandExecutor.java b/...ponge/src/main/java/org/geysermc/platform/sponge/command/GeyserSpongeCommandExecutor.java
@@ -59,10 +59,10 @@ public CommandResult process(CommandSource source, String arguments) throws Comm
                     source.sendMessage(Text.of(ChatColor.RED + LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.permission_fail")));
                     return CommandResult.success();
                 }
-                getCommand(args[0]).execute(new SpongeCommandSender(source), args);
+                getCommand(args[0]).execute(new SpongeCommandSender(source), args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[0]);
             }
         } else {
-            getCommand("help").execute(new SpongeCommandSender(source), args);
+            getCommand("help").execute(new SpongeCommandSender(source), new String[0]);
         }
         return CommandResult.success();
     }

diff --git a/...y/src/main/java/org/geysermc/platform/velocity/command/GeyserVelocityCommandExecutor.java b/...y/src/main/java/org/geysermc/platform/velocity/command/GeyserVelocityCommandExecutor.java
@@ -37,6 +37,8 @@
 import org.geysermc.connector.command.GeyserCommand;
 import org.geysermc.connector.utils.LanguageUtils;
 
+import java.util.Arrays;
+
 @AllArgsConstructor
 public class GeyserVelocityCommandExecutor implements Command {
 
@@ -51,10 +53,10 @@ public void execute(CommandSource source, String[] args) {
                     source.sendMessage(TextComponent.of(ChatColor.RED + LanguageUtils.getLocaleStringLog("geyser.bootstrap.command.permission_fail")));
                     return;
                 }
-                getCommand(args[0]).execute(new VelocityCommandSender(source), args);
+                getCommand(args[0]).execute(new VelocityCommandSender(source), args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[0]);
             }
         } else {
-            getCommand("help").execute(new VelocityCommandSender(source), args);
+            getCommand("help").execute(new VelocityCommandSender(source), new String[0]);
         }
     }