|
1 | 1 | package me.kodysimpson.simpapi.command; |
2 | 2 |
|
| 3 | +import org.bukkit.Bukkit; |
3 | 4 | import org.bukkit.command.Command; |
4 | 5 | import org.bukkit.command.CommandSender; |
5 | 6 | import org.bukkit.entity.Player; |
@@ -53,22 +54,30 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab |
53 | 54 | } |
54 | 55 |
|
55 | 56 | @Override |
56 | | - public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, String[] args) throws IllegalArgumentException { |
| 57 | + public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, String[] args) throws IllegalArgumentException { |
57 | 58 | if (args.length == 1){ //prank <subcommand> <args> |
58 | 59 | ArrayList<String> subcommandsArguments = new ArrayList<>(); |
59 | 60 |
|
| 61 | + //Does the subcommand autocomplete |
60 | 62 | for (int i = 0; i < getSubCommands().size(); i++){ |
61 | 63 | subcommandsArguments.add(getSubCommands().get(i).getName()); |
62 | 64 | } |
63 | | - |
64 | 65 | return subcommandsArguments; |
65 | 66 | }else if(args.length >= 2){ |
66 | 67 | for (int i = 0; i < getSubCommands().size(); i++){ |
67 | 68 | if (args[0].equalsIgnoreCase(getSubCommands().get(i).getName())){ |
68 | | - return getSubCommands().get(i).getSubcommandArguments((Player) sender, args); |
| 69 | + List<String> subCommandArgs = getSubCommands().get(i).getSubcommandArguments( |
| 70 | + (Player) sender, args |
| 71 | + ); |
| 72 | + |
| 73 | + if(!(subCommandArgs == null)) |
| 74 | + return subCommandArgs; |
| 75 | + |
| 76 | + return Collections.emptyList(); |
69 | 77 | } |
70 | 78 | } |
71 | 79 | } |
| 80 | + |
72 | 81 | return Collections.emptyList(); |
73 | 82 | } |
74 | 83 |
|
|
0 commit comments