mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-24 01:46:42 +02:00
e1c0033552
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: 2b4b6d14 PR-1023: Convert InventoryView to interface CraftBukkit Changes: 68603b1c1 Use expanded interaction ranges for traced interact events eae9f760c PR-1414: Convert InventoryView to interface ee9eafe67 Fix Implementation for DamageSource#isIndirect for internal custom causing entity
28 lines
2 KiB
Diff
28 lines
2 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 46bb2031141b88416f2df1fb8bca76638ef66dae..7ad73ec156417a5c8b826744f1c3ceefc0b129ce 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<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 - 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());
|