From b6a60b610a8790380c660852cad734604e5ade38 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Wed, 29 Jul 2020 05:51:40 -0400
Subject: [PATCH] Resolve (most) issues flagged by @hugmanrique in 65e1b7be873

This still needs to be configurable, but this is a first step towards shifting towards a more intuitive behavior.
---
 .../proxy/command/VelocityCommandManager.java               | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommandManager.java b/proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommandManager.java
index ff6d7c002..fc6df6f5d 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommandManager.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommandManager.java
@@ -102,11 +102,9 @@ public class VelocityCommandManager implements CommandManager {
 
     if (!(command instanceof BrigadierCommand)) {
       if (!meta.getHints().isEmpty()) {
-        // If the user specified a hint, then allow the hint to take precedence over the catch-all
-        // argument.
-        node.getChildren().clear();
+        // If the user specified a hint, then add the hints to the command node directly.
         for (CommandNode<CommandSource> hint : meta.getHints()) {
-          node.addChild(BrigadierUtils.wrapForHinting(hint, node.getCommand()));
+          node.addChild(hint);
         }
       }
     }