From 3c2f90a024fcbfb213e0bd384751a770de769136 Mon Sep 17 00:00:00 2001
From: Vankka <vankka.main@gmail.com>
Date: Mon, 13 Jan 2025 17:44:47 +0200
Subject: [PATCH] Check for brigadier better

---
 .../java/com/discordsrv/bukkit/BukkitDiscordSRVImpl.java   | 2 +-
 .../com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java   | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRVImpl.java b/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRVImpl.java
index 926d198f..acc70cc8 100644
--- a/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRVImpl.java
+++ b/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRVImpl.java
@@ -81,7 +81,7 @@ public class BukkitDiscordSRVImpl extends BukkitDiscordSRV {
     @Override
     protected void enable() throws Throwable {
         // Commands
-        if (ReflectionUtil.classExists("com.mojang.brigadier.CommandDispatcher")) {
+        if (ReflectionUtil.classExists("me.lucko.commodore.Commodore")) {
             this.commandHandler = new CommodoreHandler(this);
         } else {
             this.commandHandler = new BukkitBasicCommandHandler(this);
diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java b/bukkit/src/main/java/com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java
index 2e414197..1d785da1 100644
--- a/bukkit/src/main/java/com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java
+++ b/bukkit/src/main/java/com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java
@@ -21,6 +21,7 @@ package com.discordsrv.bukkit;
 import com.discordsrv.common.abstraction.bootstrap.LifecycleManager;
 import com.discordsrv.common.core.logging.Logger;
 import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl;
+import com.discordsrv.common.util.ReflectionUtil;
 import dev.vankka.dependencydownload.classpath.ClasspathAppender;
 import dev.vankka.dependencydownload.jarinjar.classloader.JarInJarClassLoader;
 import dev.vankka.mcdependencydownload.bukkit.bootstrap.BukkitBootstrap;
@@ -53,12 +54,8 @@ public class DiscordSRVBukkitBootstrap extends BukkitBootstrap implements IBukki
     private static List<String> getDependencyResources() {
         List<String> resources = new ArrayList<>();
         resources.add("dependencies/runtimeDownload-bukkit.txt");
-
-        try {
-            Class.forName("com.mojang.brigadier.CommandDispatcher");
+        if (ReflectionUtil.classExists("com.mojang.brigadier.CommandDispatcher")) {
             resources.add("dependencies/commodore.txt");
-        } catch (ClassNotFoundException ignored) {
-            // CommandDispatcher not present, don't need to bother downloading commodore
         }
 
         return resources;