Skip to content

Commit 4d88b33

Browse files
committed
Proper fix for tabComplete :)
1 parent b858908 commit 4d88b33

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

src/main/java/me/kodysimpson/simpapi/command/CoreCommand.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package me.kodysimpson.simpapi.command;
22

3+
import org.bukkit.Bukkit;
34
import org.bukkit.command.Command;
45
import org.bukkit.command.CommandSender;
56
import org.bukkit.entity.Player;
@@ -53,22 +54,30 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab
5354
}
5455

5556
@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 {
5758
if (args.length == 1){ //prank <subcommand> <args>
5859
ArrayList<String> subcommandsArguments = new ArrayList<>();
5960

61+
//Does the subcommand autocomplete
6062
for (int i = 0; i < getSubCommands().size(); i++){
6163
subcommandsArguments.add(getSubCommands().get(i).getName());
6264
}
63-
6465
return subcommandsArguments;
6566
}else if(args.length >= 2){
6667
for (int i = 0; i < getSubCommands().size(); i++){
6768
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();
6977
}
7078
}
7179
}
80+
7281
return Collections.emptyList();
7382
}
7483

0 commit comments

Comments
 (0)