From e6eecd806a02aadc1189ba10c4082d45b1dc3dbf Mon Sep 17 00:00:00 2001
From: Hugo Manrique <contact@hugmanrique.me>
Date: Sun, 16 May 2021 13:46:38 +0200
Subject: [PATCH 1/2] Document some restrictions in the command API

---
 .../com/velocitypowered/api/command/BrigadierCommand.java | 2 +-
 .../java/com/velocitypowered/api/command/Command.java     | 4 ++--
 .../com/velocitypowered/api/command/CommandManager.java   | 8 ++++++--
 .../java/com/velocitypowered/api/command/CommandMeta.java | 6 ++++--
 .../com/velocitypowered/api/command/InvocableCommand.java | 5 +++++
 .../velocitypowered/api/proxy/ConsoleCommandSource.java   | 2 --
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/api/src/main/java/com/velocitypowered/api/command/BrigadierCommand.java b/api/src/main/java/com/velocitypowered/api/command/BrigadierCommand.java
index da40f48a5..67af56634 100644
--- a/api/src/main/java/com/velocitypowered/api/command/BrigadierCommand.java
+++ b/api/src/main/java/com/velocitypowered/api/command/BrigadierCommand.java
@@ -18,7 +18,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
 public final class BrigadierCommand implements Command {
 
   /**
-   * Return code used by a {@link com.mojang.brigadier.Command} to indicate
+   * The return code used by a {@link com.mojang.brigadier.Command} to indicate
    * the command execution should be forwarded to the backend server.
    */
   public static final int FORWARD = 0xF6287429;
diff --git a/api/src/main/java/com/velocitypowered/api/command/Command.java b/api/src/main/java/com/velocitypowered/api/command/Command.java
index 684589578..7eb68b40c 100644
--- a/api/src/main/java/com/velocitypowered/api/command/Command.java
+++ b/api/src/main/java/com/velocitypowered/api/command/Command.java
@@ -17,8 +17,8 @@ import org.checkerframework.checker.nullness.qual.NonNull;
  * Represents a command that can be executed by a {@link CommandSource}
  * such as a {@link Player} or the console.
  *
- * <p>Velocity 1.1.0 introduces specialized command subinterfaces to separate
- * command parsing concerns. These include, in order of preference:
+ * <p><strong>You must not subclass <code>Command</code></strong>. Use one of the following
+ * <i>registrable</i> subinterfaces:</p>
  *
  * <ul>
  * <li>{@link BrigadierCommand}, which supports parameterized arguments and
diff --git a/api/src/main/java/com/velocitypowered/api/command/CommandManager.java b/api/src/main/java/com/velocitypowered/api/command/CommandManager.java
index dd0932677..00a2ae2a1 100644
--- a/api/src/main/java/com/velocitypowered/api/command/CommandManager.java
+++ b/api/src/main/java/com/velocitypowered/api/command/CommandManager.java
@@ -39,7 +39,9 @@ public interface CommandManager {
    * @param alias the first command alias
    * @param command the command to register
    * @param otherAliases additional aliases
-   * @throws IllegalArgumentException if one of the given aliases is already registered
+   * @throws IllegalArgumentException if one of the given aliases is already registered, or
+   *         the given command does not implement a registrable {@link Command} subinterface
+   * @see Command for a list of registrable {@link Command} subinterfaces
    */
   default void register(String alias, Command command, String... otherAliases) {
     register(metaBuilder(alias).aliases(otherAliases).build(), command);
@@ -58,7 +60,9 @@ public interface CommandManager {
    *
    * @param meta the command metadata
    * @param command the command to register
-   * @throws IllegalArgumentException if one of the given aliases is already registered
+   * @throws IllegalArgumentException if one of the given aliases is already registered, or
+   *         the given command does not implement a registrable {@link Command} subinterface
+   * @see Command for a list of registrable {@link Command} subinterfaces
    */
   void register(CommandMeta meta, Command command);
 
diff --git a/api/src/main/java/com/velocitypowered/api/command/CommandMeta.java b/api/src/main/java/com/velocitypowered/api/command/CommandMeta.java
index d731e6ec4..45c0a5fe5 100644
--- a/api/src/main/java/com/velocitypowered/api/command/CommandMeta.java
+++ b/api/src/main/java/com/velocitypowered/api/command/CommandMeta.java
@@ -24,8 +24,8 @@ public interface CommandMeta {
   Collection<String> getAliases();
 
   /**
-   * Returns a collection containing command nodes that provide additional
-   * argument metadata and tab-complete suggestions.
+   * Returns an immutable collection containing command nodes that provide
+   * additional argument metadata and tab-complete suggestions.
    * Note some {@link Command} implementations may not support hinting.
    *
    * @return the hinting command nodes
@@ -51,6 +51,8 @@ public interface CommandMeta {
      *
      * @param node the command node
      * @return this builder, for chaining
+     * @throws IllegalArgumentException if the node is executable, i.e. has a non-null
+     *         {@link com.mojang.brigadier.Command}, or has a redirect.
      */
     Builder hint(CommandNode<CommandSource> node);
 
diff --git a/api/src/main/java/com/velocitypowered/api/command/InvocableCommand.java b/api/src/main/java/com/velocitypowered/api/command/InvocableCommand.java
index e6183e52d..b5301ae3b 100644
--- a/api/src/main/java/com/velocitypowered/api/command/InvocableCommand.java
+++ b/api/src/main/java/com/velocitypowered/api/command/InvocableCommand.java
@@ -14,6 +14,11 @@ import java.util.concurrent.CompletableFuture;
 /**
  * A command that can be executed with arbitrary arguments.
  *
+ * <p>Modifying the command tree (e.g. registering a command via
+ * {@link CommandManager#register(CommandMeta, Command)}) during
+ * permission checking and suggestions provision results in
+ * undefined behavior, which may include deadlocks.
+ *
  * @param <I> the type of the command invocation object
  */
 public interface InvocableCommand<I extends CommandInvocation<?>> extends Command {
diff --git a/api/src/main/java/com/velocitypowered/api/proxy/ConsoleCommandSource.java b/api/src/main/java/com/velocitypowered/api/proxy/ConsoleCommandSource.java
index 191b56de7..018ea097c 100644
--- a/api/src/main/java/com/velocitypowered/api/proxy/ConsoleCommandSource.java
+++ b/api/src/main/java/com/velocitypowered/api/proxy/ConsoleCommandSource.java
@@ -7,8 +7,6 @@
 
 package com.velocitypowered.api.proxy;
 
-import com.velocitypowered.api.command.CommandSource;
-
 /**
  * Indicates that the executor of the command is the console.
  */

From f103662dc4eec0d6aeb6d4a630f78fca69f7481e Mon Sep 17 00:00:00 2001
From: Hugo Manrique <contact@hugmanrique.me>
Date: Sat, 5 Jun 2021 18:33:22 +0200
Subject: [PATCH 2/2] Fix incorrect import removal

---
 .../com/velocitypowered/api/proxy/ConsoleCommandSource.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/src/main/java/com/velocitypowered/api/proxy/ConsoleCommandSource.java b/api/src/main/java/com/velocitypowered/api/proxy/ConsoleCommandSource.java
index 018ea097c..191b56de7 100644
--- a/api/src/main/java/com/velocitypowered/api/proxy/ConsoleCommandSource.java
+++ b/api/src/main/java/com/velocitypowered/api/proxy/ConsoleCommandSource.java
@@ -7,6 +7,8 @@
 
 package com.velocitypowered.api.proxy;
 
+import com.velocitypowered.api.command.CommandSource;
+
 /**
  * Indicates that the executor of the command is the console.
  */