Merge pull request #177 from InsightsPlugin/fix/spigot-brigadier

Fix attempted brigadier registration on spigot
InsightsPlugin · Aug 21, 2022 · 95759d3 · 95759d3
2 parents 233693a + 6b49a94
commit 95759d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Insights/src/main/java/dev/frankheijden/insights/Insights.java b/Insights/src/main/java/dev/frankheijden/insights/Insights.java
@@ -274,7 +274,10 @@ private void loadCommands() {
         );
 
         // Register capabilities if allowed
-        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();
             CloudBrigadierManager<CommandSender, ?> brigadierManager = commandManager.brigadierManager();
             var handler = new BrigadierHandler(brigadierManager);

diff --git a/buildSrc/src/main/kotlin/VersionConstants.kt b/buildSrc/src/main/kotlin/VersionConstants.kt
@@ -3,7 +3,7 @@ object VersionConstants {
     const val pluginYmlVersion = "0.5.2"
     const val shadowVersion = "7.1.2"
     const val minecraftVersion = "1.19.2-R0.1-SNAPSHOT"
-    const val cloudVersion = "1.7.0"
+    const val cloudVersion = "1.8.0-SNAPSHOT"
     const val adventureVersion = "4.12.0-SNAPSHOT"
     const val adventurePlatformVersion = "4.1.2"
     const val paperLibVersion = "1.0.7"