mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 22:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix command NPEs on invalid IDs

Browse Source
This commit is contained in:
dfsek
2021-03-10 03:20:34 -07:00
parent a584ac2401
commit 06956a7a2d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/dfsek/terra/api/command/TerraCommandManager.java
+2
View File
@@ -48,6 +48,7 @@ public class TerraCommandManager implements CommandManager {
@Override @Override
public void execute(String commandName, CommandSender sender, List<String> argsIn) throws CommandException { public void execute(String commandName, CommandSender sender, List<String> argsIn) throws CommandException {
if(!commands.containsKey(commandName)) throw new InvalidArgumentsException("No such command \"" + commandName + "\"");
execute(commands.get(commandName), sender, new ArrayList<>(argsIn)); execute(commands.get(commandName), sender, new ArrayList<>(argsIn));
} }
@@ -190,6 +191,7 @@ public class TerraCommandManager implements CommandManager {
@Override @Override
public List<String> tabComplete(String command, CommandSender sender, List<String> args) throws CommandException { public List<String> tabComplete(String command, CommandSender sender, List<String> args) throws CommandException {
if(args.isEmpty()) return new ArrayList<>(commands.keySet()).stream().sorted(String::compareTo).collect(Collectors.toList()); if(args.isEmpty()) return new ArrayList<>(commands.keySet()).stream().sorted(String::compareTo).collect(Collectors.toList());
if(!commands.containsKey(command)) return Collections.emptyList();
return tabComplete(commands.get(command), sender, new ArrayList<>(args)).stream().filter(s -> s.toLowerCase().startsWith(args.get(args.size() - 1).toLowerCase())).sorted(String::compareTo).collect(Collectors.toList()); return tabComplete(commands.get(command), sender, new ArrayList<>(args)).stream().filter(s -> s.toLowerCase().startsWith(args.get(args.size() - 1).toLowerCase())).sorted(String::compareTo).collect(Collectors.toList());
} }