Skip to content
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

Prevent vanished players from being in plot kick autocompletion #4485

Merged
merged 1 commit into from
Aug 30, 2024
+5 −2
Merged

Prevent vanished players from being in plot kick autocompletion #4485

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
2 changes: 1 addition & 1 deletion Core/src/main/java/com/plotsquared/core/command/Kick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public Collection<Command> tab(final PlotPlayer<?> player, final String[] args,
if (plot == null) {
return Collections.emptyList();
}
return TabCompletions.completePlayersInPlot(plot, String.join(",", args).trim(),
return TabCompletions.completePlayersInPlot(player, plot, String.join(",", args).trim(),
Collections.singletonList(player.getName())
);
}
Expand Down
5 changes: 4 additions & 1 deletion Core/src/main/java/com/plotsquared/core/util/TabCompletions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ private TabCompletions() {
}

public static @NonNull List<Command> completePlayersInPlot(
final @NonNull PlotPlayer<?> issuer,
final @NonNull Plot plot,
final @NonNull String input, final @NonNull List<String> existing
) {
Expand All @@ -115,7 +116,9 @@ private TabCompletions() {
final List<PlotPlayer<?>> inPlot = plot.getPlayersInPlot();
players = new ArrayList<>(inPlot.size());
for (PlotPlayer<?> player : inPlot) {
players.add(player.getName());
if (issuer.canSee(player)) {
players.add(player.getName());
}
}
cachedCompletionValues.put("inPlot" + plot, players);
}
Expand Down
Loading