From 4de99466837d89cdac0063462eb5282c93b24fbf Mon Sep 17 00:00:00 2001
From: allenclan23 <ajacob715@gmail.com>
Date: Thu, 15 Oct 2020 23:21:07 -0400
Subject: [PATCH] Fix an issue created by breaking changes in Velocity.
 CommandSource#sendMessage now requires an Identity

---
 .../commandframework/velocity/VelocityExecutor.java      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java
index 1b158025..c045de03 100644
--- a/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java
+++ b/cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityExecutor.java
@@ -32,6 +32,7 @@ import cloud.commandframework.execution.CommandResult;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
 import com.velocitypowered.api.command.CommandSource;
+import net.kyori.adventure.identity.Identity;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -79,6 +80,7 @@ final class VelocityExecutor<C> implements Command<CommandSource> {
                             (InvalidSyntaxException) throwable,
                             (c, e) ->
                                     source.sendMessage(
+                                            Identity.nil(),
                                             Component
                                                     .text()
                                                     .append(
@@ -100,6 +102,7 @@ final class VelocityExecutor<C> implements Command<CommandSource> {
                             (InvalidCommandSenderException) throwable,
                             (c, e) ->
                                     source.sendMessage(
+                                            Identity.nil(),
                                             Component.text(
                                                     finalThrowable.getMessage(),
                                                     NamedTextColor.RED
@@ -111,14 +114,14 @@ final class VelocityExecutor<C> implements Command<CommandSource> {
                             sender,
                             NoPermissionException.class,
                             (NoPermissionException) throwable,
-                            (c, e) -> source.sendMessage(Component.text(MESSAGE_NO_PERMS))
+                            (c, e) -> source.sendMessage(Identity.nil(), Component.text(MESSAGE_NO_PERMS))
                     );
                 } else if (throwable instanceof NoSuchCommandException) {
                     this.manager.handleException(
                             sender,
                             NoSuchCommandException.class,
                             (NoSuchCommandException) throwable,
-                            (c, e) -> source.sendMessage(Component.text(MESSAGE_UNKNOWN_COMMAND))
+                            (c, e) -> source.sendMessage(Identity.nil(), Component.text(MESSAGE_UNKNOWN_COMMAND))
                     );
                 } else if (throwable instanceof ArgumentParseException) {
                     this.manager.handleException(
@@ -127,6 +130,7 @@ final class VelocityExecutor<C> implements Command<CommandSource> {
                             (ArgumentParseException) throwable,
                             (c, e) ->
                                     source.sendMessage(
+                                            Identity.nil(),
                                             Component.text()
                                             .append(Component.text(
                                                     "Invalid Command Argument: ",
@@ -140,6 +144,7 @@ final class VelocityExecutor<C> implements Command<CommandSource> {
                     );
                 } else {
                     source.sendMessage(
+                            Identity.nil(),
                             Component.text(throwable.getMessage(), NamedTextColor.RED)
                     );
                     throwable.printStackTrace();