Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 19:40:07 +01:00
ef0e5a642d
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
33 Zeilen
1.7 KiB
Diff
33 Zeilen
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: stonar96 <minecraft.stonar96@gmail.com>
|
|
Date: Sun, 12 Sep 2021 00:14:21 +0200
|
|
Subject: [PATCH] Check requirement before suggesting root nodes
|
|
|
|
Child nodes are handled by CommandDispatcher#parse checking
|
|
requirements.
|
|
|
|
Vanilla clients only send ServerboundCommandSuggestionPacket when
|
|
encountering a command node with ASK_SERVER suggestions, however a
|
|
modified client can send this packet whenever it wants.
|
|
|
|
diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
|
|
index e733a5657032d29e5a0d64375c9e36639360a7e0..b64c98c173e25055f4ff9d7124d0a3cb7ff6ab1d 100644
|
|
--- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java
|
|
+++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
|
|
@@ -595,10 +595,14 @@ public class CommandDispatcher<S> {
|
|
int i = 0;
|
|
for (final CommandNode<S> node : parent.getChildren()) {
|
|
CompletableFuture<Suggestions> future = Suggestions.empty();
|
|
+ // Paper start - Don't suggest if the requirement isn't met
|
|
+ if (parent != this.root || node.canUse(context.getSource())) {
|
|
try {
|
|
- if (node.canUse(parse.getContext().getSource())) future = node.listSuggestions(context.build(truncatedInput), new SuggestionsBuilder(truncatedInput, truncatedInputLowerCase, start)); // CraftBukkit
|
|
+ future = node.listSuggestions(context.build(truncatedInput), new SuggestionsBuilder(truncatedInput, truncatedInputLowerCase, start)); // CraftBukkit
|
|
} catch (final CommandSyntaxException ignored) {
|
|
}
|
|
+ }
|
|
+ // Paper end
|
|
futures[i++] = future;
|
|
}
|
|
|