Skip to content

Fix IndexOutOfBoundsException in AlternativeCommandsHandler.getAlternative #6609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
minoneer wants to merge 1 commit into
base: 2.x
Choose a base branch
from
+8 −2
Open

Fix IndexOutOfBoundsException in AlternativeCommandsHandler.getAlternative #6609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/AlternativeCommandsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ public Command getAlternative(final String label) {
}

// return the first command that is not an alias
Command firstAlias = null;

final Iterator<WeakReference<Command>> iterator = commands.iterator();
while (iterator.hasNext()) {
final Command cmd = iterator.next().get();
Expand All @@ -127,10 +129,14 @@ public Command getAlternative(final String label) {
if (cmd.getName().equalsIgnoreCase(label)) {
return cmd;
}

if (firstAlias == null) {
firstAlias = cmd;
}
}

// return the first alias
return commands.get(0).get();
// return the first alias, or null if every reference in this bucket has been collected
return firstAlias;
}

public void executed(final String label, final Command pc) {
Expand Down