Skip to content

Commit bdfa1f6

Browse files
authored
Brigadier: fix simpleUnwrap not keeping redirect modifier and forks properties from original node (#11654)
1 parent dae475b commit bdfa1f6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

patches/server/0950-Brigadier-based-command-API.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public net.minecraft.server.ReloadableServerResources registryLookup
1010
public net.minecraft.server.ReloadableServerResources
1111

1212
Co-authored-by: Jake Potrebic <[email protected]>
13+
Co-authored-by: Marc Baloup <[email protected]>
1314

1415
diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
1516
index 4b4f812eb13d5f03bcf3f8724d8aa8dbbc724e8b..a4d5d7017e0be79844b996de85a63cad5f8488bc 100644
@@ -253,7 +254,7 @@ index dd6012b6a097575b2d1471be5069eccee4537c0a..00000000000000000000000000000000
253254
-}
254255
diff --git a/src/main/java/io/papermc/paper/command/brigadier/ApiMirrorRootNode.java b/src/main/java/io/papermc/paper/command/brigadier/ApiMirrorRootNode.java
255256
new file mode 100644
256-
index 0000000000000000000000000000000000000000..23525592d880f340745a28c956fa38d3e4057231
257+
index 0000000000000000000000000000000000000000..74d7b19627a127364f3c51700884746d3af1caac
257258
--- /dev/null
258259
+++ b/src/main/java/io/papermc/paper/command/brigadier/ApiMirrorRootNode.java
259260
@@ -0,0 +1,253 @@
@@ -505,7 +506,7 @@ index 0000000000000000000000000000000000000000..23525592d880f340745a28c956fa38d3
505506
+
506507
+ private CommandNode<CommandSourceStack> simpleUnwrap(final CommandNode<CommandSourceStack> node) {
507508
+ return node.createBuilder()
508-
+ .redirect(node.getRedirect() == null ? null : this.unwrapNode(node.getRedirect()))
509+
+ .forward(node.getRedirect() == null ? null : this.unwrapNode(node.getRedirect()), node.getRedirectModifier(), node.isFork())
509510
+ .build();
510511
+ }
511512
+

0 commit comments

Comments
 (0)