2023-08-21 06:50:11 +02:00
|
|
|
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
|
2024-06-16 12:56:00 +02:00
|
|
|
index e1cae30864f033d32c8e7c3e6e4e4af92d74f2b0..48c1327d7226fdbb34ef0cc9e6516aaf94e6781c 100644
|
2023-08-21 06:50:11 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2024-06-14 10:17:11 +02:00
|
|
|
@@ -820,6 +820,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
2024-02-05 12:31:51 +01:00
|
|
|
ParseResults<CommandSourceStack> parseresults = this.server.getCommands().getDispatcher().parse(stringreader, this.player.createCommandSourceStack());
|
2023-08-21 06:50:11 +02:00
|
|
|
|
2024-02-05 12:31:51 +01:00
|
|
|
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 - Don't tab-complete namespaced commands if send-namespaced is false
|
|
|
|
// Paper start - Brigadier API
|
|
|
|
com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent(this.getCraftPlayer(), suggestions, packet.getCommand());
|
|
|
|
suggestEvent.setCancelled(suggestions.isEmpty());
|