From 45ba6788bd921ba081f93067ae9ac1180233108b Mon Sep 17 00:00:00 2001
From: Frank van der Heijden <frank.boekanier@gmail.com>
Date: Sun, 21 Aug 2022 14:01:28 +0200
Subject: [PATCH] Fix attempted brigadier registration on spigot

---
 .../serverutils/bukkit/entities/BukkitPlugin.java            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/entities/BukkitPlugin.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/entities/BukkitPlugin.java
index 88ceaf2..f711d76 100644
--- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/entities/BukkitPlugin.java
+++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/entities/BukkitPlugin.java
@@ -58,7 +58,10 @@ public class BukkitPlugin extends ServerUtilsPlugin<Plugin, BukkitTask, BukkitAu
             throw new RuntimeException(ex);
         }
 
-        if (commandManager.hasCapability(CloudBukkitCapabilities.BRIGADIER)) {
+        boolean hasBrigadier = commandManager.hasCapability(CloudBukkitCapabilities.BRIGADIER);
+        boolean hasNativeBrigadier = commandManager.hasCapability(CloudBukkitCapabilities.NATIVE_BRIGADIER);
+        boolean hasCommodoreBrigadier = commandManager.hasCapability(CloudBukkitCapabilities.COMMODORE_BRIGADIER);
+        if (hasBrigadier && (hasNativeBrigadier || hasCommodoreBrigadier)) {
             commandManager.registerBrigadier();
             handleBrigadier(commandManager.brigadierManager());
         }