sasheg/DeltaZern
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get console Brig suggestions from main thread fixes #13027 (#13028)

Browse Source
This commit is contained in:
Jason Penilla
2025-08-28 17:25:42 -07:00
committed by GitHub
parent 51706e5ac1
commit b6168b7ccc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paper-server/src/main/java/io/papermc/paper/console/BrigadierCommandCompleter.java
+6 -2
View File
@@ -8,9 +8,10 @@ import com.mojang.brigadier.ParseResults;
import com.mojang.brigadier.StringReader; import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.suggestion.Suggestion; import com.mojang.brigadier.suggestion.Suggestion;
import io.papermc.paper.adventure.PaperAdventure; import io.papermc.paper.adventure.PaperAdventure;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.CommandSourceStack;
@@ -45,7 +46,10 @@ public final class BrigadierCommandCompleter {
final ParseResults<CommandSourceStack> results = dispatcher.parse(new StringReader(line.line()), this.commandSourceStack.get()); final ParseResults<CommandSourceStack> results = dispatcher.parse(new StringReader(line.line()), this.commandSourceStack.get());
this.addCandidates( this.addCandidates(
candidates, candidates,
dispatcher.getCompletionSuggestions(results, line.cursor()).join().getList(), CompletableFuture.supplyAsync(() -> dispatcher.getCompletionSuggestions(results, line.cursor()), this.server::scheduleOnMain)
.thenCompose(Function.identity())
.join()
.getList(),
existing, existing,
new ParseContext(line.line(), results.getContext().findSuggestionContext(line.cursor()).startPos) new ParseContext(line.line(), results.getContext().findSuggestionContext(line.cursor()).startPos)
); );