From 50614af637ea15436a406dc03d9c18300da805fb Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Tue, 17 Nov 2020 07:19:25 -0500
Subject: [PATCH] Fix bad merge

---
 .../com/velocitypowered/proxy/command/CommandManagerTests.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/src/test/java/com/velocitypowered/proxy/command/CommandManagerTests.java b/proxy/src/test/java/com/velocitypowered/proxy/command/CommandManagerTests.java
index e55640066..34d3f8336 100644
--- a/proxy/src/test/java/com/velocitypowered/proxy/command/CommandManagerTests.java
+++ b/proxy/src/test/java/com/velocitypowered/proxy/command/CommandManagerTests.java
@@ -92,7 +92,7 @@ public class CommandManagerTests {
     assertTrue(manager.hasCommand("foO"));
     manager.unregister("fOo");
     assertFalse(manager.hasCommand("foo"));
-    assertFalse(manager.execute(MockCommandSource.INSTANCE, "foo"));
+    assertFalse(manager.execute(MockCommandSource.INSTANCE, "foo").join());
 
     manager.register("foo", command, "bAr", "BAZ");
     assertTrue(manager.hasCommand("bar"));