From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: EpicPlayerA10 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 2ee205375250456c89aae7a472014f9598c2359e..61f379d456f2774f9b95435db4467a9835d9c2f6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -820,6 +820,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl ParseResults 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 - 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());