From 9c5af32afa27de882dc089be9e629db110d70333 Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Thu, 10 Aug 2017 09:03:10 +0200
Subject: [PATCH] When we redirect, add initial node to the context

---
 src/main/java/com/mojang/brigadier/CommandDispatcher.java      | 2 +-
 .../com/mojang/brigadier/context/CommandContextBuilder.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
index e59a43a..22b5699 100644
--- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java
+++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
@@ -109,7 +109,7 @@ public class CommandDispatcher<S> {
             if (reader.canRead()) {
                 reader.skip();
                 if (child.getRedirect() != null) {
-                    return parseNodes(child.getRedirect(), reader, context.redirect());
+                    return parseNodes(child.getRedirect(), reader, context.redirect(child.getRedirect()));
                 } else {
                     return parseNodes(child, reader, context);
                 }
diff --git a/src/main/java/com/mojang/brigadier/context/CommandContextBuilder.java b/src/main/java/com/mojang/brigadier/context/CommandContextBuilder.java
index 065b5c5..401c93d 100644
--- a/src/main/java/com/mojang/brigadier/context/CommandContextBuilder.java
+++ b/src/main/java/com/mojang/brigadier/context/CommandContextBuilder.java
@@ -63,8 +63,9 @@ public class CommandContextBuilder<S> {
         return copy;
     }
 
-    public CommandContextBuilder<S> redirect() {
+    public CommandContextBuilder<S> redirect(final CommandNode<S> newRoot) {
         final CommandContextBuilder<S> result = new CommandContextBuilder<>(dispatcher, source);
+        result.withNode(newRoot, "");
         result.parent = build();
         return result;
     }