From 6b49a94317970349c73c8dace6ad9e0002aa906a Mon Sep 17 00:00:00 2001 From: Frank van der Heijden Date: Sun, 21 Aug 2022 14:23:40 +0200 Subject: [PATCH] Fix attempted brigadier registration on spigot --- .../src/main/java/dev/frankheijden/insights/Insights.java | 5 ++++- buildSrc/src/main/kotlin/VersionConstants.kt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Insights/src/main/java/dev/frankheijden/insights/Insights.java b/Insights/src/main/java/dev/frankheijden/insights/Insights.java index bcc88b51..12d9c6f4 100644 --- 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 brigadierManager = commandManager.brigadierManager(); var handler = new BrigadierHandler(brigadierManager); diff --git a/buildSrc/src/main/kotlin/VersionConstants.kt b/buildSrc/src/main/kotlin/VersionConstants.kt index eddb460f..2e939f72 100644 --- 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"