geforkt von Mirrors/Paper
29 Zeilen
2.1 KiB
Diff
29 Zeilen
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: EpicPlayerA10 <adasko.lesiak@gmail.com>
|
|
Date: Sun, 18 Jun 2023 12:38:24 +0200
|
|
Subject: [PATCH] Don't tab-complete namespaced commands if send-namespaced is
|
|
false
|
|
|
|
Tab-complete packet is supposed to tab-complete args for commands, but
|
|
it also can suggest commands like in version 1.12.2 or lower.
|
|
|
|
This patch prevents server from sending namespaced commands when player
|
|
requests tab-complete only commands.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index 78c1f4e964bd4906d6c9f186101869709e054af2..2aea0da0f99d4707c1b6703831e5986b27de719a 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -798,6 +798,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
ParseResults<CommandSourceStack> parseresults = this.server.getCommands().getDispatcher().parse(stringreader, this.player.createCommandSourceStack());
|
|
|
|
this.server.getCommands().getDispatcher().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
|
|
+ // Paper start - Don't tab-complete namespaced commands if send-namespaced is false
|
|
+ if (!org.spigotmc.SpigotConfig.sendNamespaced && suggestions.getRange().getStart() <= 1) {
|
|
+ suggestions.getList().removeIf(suggestion -> suggestion.getText().contains(":"));
|
|
+ }
|
|
+ // Paper end
|
|
// Paper start - Brigadier API
|
|
com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent(this.getCraftPlayer(), suggestions, command);
|
|
suggestEvent.setCancelled(suggestions.isEmpty());
|