From bdfa1f6864e7e6f484058d96f407ba7d1e3eac56 Mon Sep 17 00:00:00 2001
From: Marc Baloup <marcbal@users.noreply.github.com>
Date: Sun, 8 Dec 2024 22:23:55 +0100
Subject: [PATCH] Brigadier: fix simpleUnwrap not keeping redirect modifier and
 forks properties from original node (#11654)

---
 patches/server/0950-Brigadier-based-command-API.patch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/patches/server/0950-Brigadier-based-command-API.patch b/patches/server/0950-Brigadier-based-command-API.patch
index c50f9ac281..e0a4521c40 100644
--- a/patches/server/0950-Brigadier-based-command-API.patch
+++ b/patches/server/0950-Brigadier-based-command-API.patch
@@ -10,6 +10,7 @@ public net.minecraft.server.ReloadableServerResources registryLookup
 public net.minecraft.server.ReloadableServerResources
 
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
+Co-authored-by: Marc Baloup <marc.baloup@laposte.net>
 
 diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
 index 4b4f812eb13d5f03bcf3f8724d8aa8dbbc724e8b..a4d5d7017e0be79844b996de85a63cad5f8488bc 100644
@@ -253,7 +254,7 @@ index dd6012b6a097575b2d1471be5069eccee4537c0a..00000000000000000000000000000000
 -}
 diff --git a/src/main/java/io/papermc/paper/command/brigadier/ApiMirrorRootNode.java b/src/main/java/io/papermc/paper/command/brigadier/ApiMirrorRootNode.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..23525592d880f340745a28c956fa38d3e4057231
+index 0000000000000000000000000000000000000000..74d7b19627a127364f3c51700884746d3af1caac
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/command/brigadier/ApiMirrorRootNode.java
 @@ -0,0 +1,253 @@
@@ -505,7 +506,7 @@ index 0000000000000000000000000000000000000000..23525592d880f340745a28c956fa38d3
 +
 +    private CommandNode<CommandSourceStack> simpleUnwrap(final CommandNode<CommandSourceStack> node) {
 +        return node.createBuilder()
-+            .redirect(node.getRedirect() == null ? null : this.unwrapNode(node.getRedirect()))
++            .forward(node.getRedirect() == null ? null : this.unwrapNode(node.getRedirect()), node.getRedirectModifier(), node.isFork())
 +            .build();
 +    }
 +