From 2516f485710c172027caf9b6c25595ab7031e3c2 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 18 Jun 2020 07:41:02 +1000 Subject: [PATCH] Revert "#675: Fix redirected CommandNodes sometimes not being properly redirected" This reverts commit 36e3ae4ae6da3de22ffa16e8171226df51cb005d. By: md_5 --- paper-server/nms-patches/CommandDispatcher.patch | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/paper-server/nms-patches/CommandDispatcher.patch b/paper-server/nms-patches/CommandDispatcher.patch index cc91a04785..f199c5b4fb 100644 --- a/paper-server/nms-patches/CommandDispatcher.patch +++ b/paper-server/nms-patches/CommandDispatcher.patch @@ -140,20 +140,10 @@ argumentbuilder.requires((icompletionprovider) -> { 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 destination = commandnode2.getRedirect(); -+ if (destination != null) { -+ this.a(destination, (CommandNode) destination.createBuilder().build(), commandlistenerwrapper, map); -+ argumentbuilder.redirect((CommandNode) map.get(destination)); - } -+ // Craftbukkit end - - CommandNode commandnode3 = argumentbuilder.build(); + CommandNode commandnode3 = argumentbuilder.build(); // CraftBukkit - decompile error