Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-04 06:31:35 +01:00
Code Issues Projects Releases Wiki Activity

Revert "#675: Fix redirected CommandNodes sometimes not being properly redirected"

Browse Source 
This reverts commit 36e3ae4ae6.

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2020-06-18 07:41:02 +10:00
parent 36e3ae4ae6
commit 2516f48571
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/CommandDispatcher.patch
View File

@ -140,20 +140,10 @@
argumentbuilder.requires((icompletionprovider) -> { argumentbuilder.requires((icompletionprovider) -> {
return true; return true;
@@ -218,11 +297,15 @@ @@ -222,7 +301,7 @@
} argumentbuilder.redirect((CommandNode) map.get(argumentbuilder.getRedirect()));
} }
- if (argumentbuilder.getRedirect() != null) {
- argumentbuilder.redirect((CommandNode) map.get(argumentbuilder.getRedirect()));
+ // Craftbukkit start - fix redirected CommandNodes not being properly redirected if it is mapped after commandNode2
+ CommandNode<CommandListenerWrapper> destination = commandnode2.getRedirect();
+ if (destination != null) {
+ this.a(destination, (CommandNode) destination.createBuilder().build(), commandlistenerwrapper, map);
+ argumentbuilder.redirect((CommandNode) map.get(destination));
}
+ // Craftbukkit end
- CommandNode<ICompletionProvider> commandnode3 = argumentbuilder.build(); - CommandNode<ICompletionProvider> commandnode3 = argumentbuilder.build();
+ CommandNode commandnode3 = argumentbuilder.build(); // CraftBukkit - decompile error + CommandNode commandnode3 = argumentbuilder.build(); // CraftBukkit - decompile error