upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong order in filter vanilla commands patch. Fixes #10563

Browse Source
This commit is contained in:
LexManos committed 2025-06-19 00:49:08 -07:00
1 parent 18c806f1d0
commit 1527738ddc
1 file changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files
patches/minecraft/net/minecraft/commands/Commands.java.patch
+3 -4
View File
@@ -37,16 +37,15 @@
if (contextchain != null) {
executeCommandInContext(
commandsourcestack,
@@ -395,8 +_,11 @@
public void sendCommands(ServerPlayer p_82096_) {
@@ -396,7 +_,10 @@
Map<CommandNode<CommandSourceStack>, CommandNode<CommandSourceStack>> map = new HashMap<>();
RootCommandNode<CommandSourceStack> rootcommandnode = new RootCommandNode<>();
+ // FORGE: Clean any modded command content if the client is vanilla
+ rootcommandnode = net.minecraftforge.server.command.CommandHelper.filterCommandList(p_82096_.connection.getConnection(), rootcommandnode);
map.put(this.dispatcher.getRoot(), rootcommandnode);
- fillUsableCommands(this.dispatcher.getRoot(), rootcommandnode, p_82096_.createCommandSourceStack(), map);
+ // FORGE: Use our own command node merging method to handle redirect nodes properly, see issue #7551
+ net.minecraftforge.server.command.CommandHelper.mergeCommandNode(this.dispatcher.getRoot(), rootcommandnode, map, p_82096_.createCommandSourceStack(), ctx -> 0, suggest -> suggest);
+ // FORGE: Clean any modded command content if the client is vanilla
+ rootcommandnode = net.minecraftforge.server.command.CommandHelper.filterCommandList(p_82096_.connection.getConnection(), rootcommandnode);
p_82096_.connection.send(new ClientboundCommandsPacket(rootcommandnode, COMMAND_NODE_INSPECTOR));
}