Skip to content

fix: correct command tab completion #32

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

Merged
ryanbarlow97 merged 1 commit into from
Oct 15, 2026
Merged

fix: correct command tab completion #32

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion src/main/java/net/tfminecraft/surgery/commands/SurgeryCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ private boolean checkCanStart(Player surgeon, Player patient) {

@Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
if (!(sender instanceof Player player)) {
return List.of();
}
List<String> options = new ArrayList<>();
if (args.length != 1) {
return options;
Expand All @@ -217,7 +220,7 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
options.add(sub);
}
}
if (sender instanceof Player player && canOperate(player)) {
if (canOperate(player)) {
for (Player online : Bukkit.getOnlinePlayers()) {
if (!online.equals(player) && player.canSee(online)
&& online.getName().toLowerCase(Locale.ROOT).startsWith(prefix)) {
Expand Down
5 changes: 4 additions & 1 deletion src/test/java/net/tfminecraft/surgery/commands/SurgeryCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@ void completionFiltersByPermissionVisibilityPrefixAndArgumentPosition() {
assertTrue(command.onTabComplete(surgeon, bukkitCommand, "surgery", new String[]{"PA"}).isEmpty());
when(surgeon.hasPermission(anyString())).thenReturn(false);
assertEquals(List.of("accept", "deny"), command.onTabComplete(surgeon, bukkitCommand, "surgery", new String[]{""}));
assertEquals(List.of("accept"), command.onTabComplete(mock(CommandSender.class), bukkitCommand, "surgery", new String[]{"A"}));
assertEquals(List.of("accept"), command.onTabComplete(surgeon, bukkitCommand, "surgery", new String[]{"A"}));
assertTrue(command.onTabComplete(mock(CommandSender.class), bukkitCommand, "surgery", new String[]{""}).isEmpty());
assertTrue(command.onTabComplete(mock(CommandSender.class), bukkitCommand, "surgery", new String[]{"A"}).isEmpty());
assertTrue(command.onTabComplete(mock(CommandSender.class), bukkitCommand, "surgery", new String[]{"deny"}).isEmpty());
}
}