Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix invoking help command throwing exception

Browse Source 
- ConcurrentModificationException was being thrown because labels was being modified again in transformForHelpCommand
This commit is contained in:
ljacqu 2015-12-19 17:45:58 +01:00
parent a928a4092d
commit b64b6177fa
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/fr/xephi/authme/command/CommandHandler.java
View File

@ -181,8 +181,7 @@ public class CommandHandler {
if (childCommand != null) { if (childCommand != null) {
FoundCommandResult result = new FoundCommandResult( FoundCommandResult result = new FoundCommandResult(
childCommand, parts.subList(0, 2), parts.subList(2, parts.size())); childCommand, parts.subList(0, 2), parts.subList(2, parts.size()));
transformResultForHelp(result); return transformResultForHelp(result);
return result;
} else if (hasSuitableArgumentCount(base, remainingParts.size())) { } else if (hasSuitableArgumentCount(base, remainingParts.size())) {
return new FoundCommandResult(base, parts.subList(0, 1), parts.subList(1, parts.size())); return new FoundCommandResult(base, parts.subList(0, 1), parts.subList(1, parts.size()));
} }
@ -260,15 +259,18 @@ public class CommandHandler {
return null; return null;
} }
private static void transformResultForHelp(FoundCommandResult result) { private static FoundCommandResult transformResultForHelp(FoundCommandResult result) {
if (result.getCommandDescription() != null if (result.getCommandDescription() != null
&& HELP_COMMAND_CLASS.isAssignableFrom(result.getCommandDescription().getExecutableCommand().getClass())) { && HELP_COMMAND_CLASS.isAssignableFrom(result.getCommandDescription().getExecutableCommand().getClass())) {
// For "/authme help register" we have labels = [authme, help] and arguments = [register] // For "/authme help register" we have labels = [authme, help] and arguments = [register]
// But for the help command we want labels = [authme, help] and arguments = [authme, register], // But for the help command we want labels = [authme, help] and arguments = [authme, register],
// so we can use the arguments as the labels to the command to show help for // so we can use the arguments as the labels to the command to show help for
final String baseLabel = result.getLabels().get(0); List<String> arguments = new ArrayList<>(result.getArguments());
result.getArguments().add(0, baseLabel); arguments.add(0, result.getLabels().get(0));
return new FoundCommandResult(result.getCommandDescription(), result.getLabels(),
arguments, result.getDifference(), result.getResultStatus());
} }
return result;
} }
private static boolean hasSuitableArgumentCount(CommandDescription command, int argumentCount) { private static boolean hasSuitableArgumentCount(CommandDescription command, int argumentCount) {