From 61597998045a28d4b4d08825a5278bdfc3cc3271 Mon Sep 17 00:00:00 2001
From: Konicai <71294714+Konicai@users.noreply.github.com>
Date: Mon, 10 Jun 2024 23:39:21 -0500
Subject: [PATCH] some review

---
 .../geyser/api/command/CommandSource.java        |  3 +--
 .../platform/spigot/GeyserSpigotPlugin.java      | 16 +++++++---------
 .../java/org/geysermc/geyser/Permissions.java    |  1 -
 .../geysermc/geyser/command/GeyserCommand.java   |  1 -
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/api/src/main/java/org/geysermc/geyser/api/command/CommandSource.java b/api/src/main/java/org/geysermc/geyser/api/command/CommandSource.java
index 414046c0d..c1453f579 100644
--- a/api/src/main/java/org/geysermc/geyser/api/command/CommandSource.java
+++ b/api/src/main/java/org/geysermc/geyser/api/command/CommandSource.java
@@ -77,8 +77,7 @@ public interface CommandSource {
      * @return a GeyserConnection if this source represents a Bedrock player that is connected
      * to this Geyser instance, otherwise null
      */
-    @Nullable
-    GeyserConnection connection();
+    @Nullable GeyserConnection connection();
 
     /**
      * Returns the locale of the command source.
diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
index 9ddc45348..5125a072c 100644
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
@@ -66,7 +66,6 @@ import org.geysermc.geyser.platform.spigot.world.manager.GeyserSpigotWorldManage
 import org.geysermc.geyser.text.GeyserLocale;
 import org.geysermc.geyser.util.FileUtils;
 import org.incendo.cloud.bukkit.BukkitCommandManager;
-import org.incendo.cloud.bukkit.CloudBukkitCapabilities;
 import org.incendo.cloud.execution.ExecutionCoordinator;
 import org.incendo.cloud.paper.LegacyPaperCommandManager;
 
@@ -172,7 +171,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
         );
         LegacyPaperCommandManager<GeyserCommandSource> cloud;
         try {
-            // LegacyPaperCommandManager works for spigot too. todo: use PaperCommandManager instead for Paper 1.20.6+
+            // LegacyPaperCommandManager works for spigot too, see https://cloud.incendo.org/minecraft/paper
             cloud = new LegacyPaperCommandManager<>(
                     this,
                     ExecutionCoordinator.simpleCoordinator(),
@@ -182,13 +181,12 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
             throw new RuntimeException(e);
         }
 
-        if (cloud.hasCapability(CloudBukkitCapabilities.BRIGADIER)) {
-            try {
-                // Should always be available on 1.13 and up
-                cloud.registerBrigadier();
-            } catch (BukkitCommandManager.BrigadierInitializationException e) {
-                geyserLogger.debug("Failed to initialize Brigadier support: " + e.getMessage());
-            }
+        try {
+            // Commodore brigadier on Spigot/Paper 1.13 - 1.18.2
+            // Paper-only brigadier on 1.19+
+            cloud.registerBrigadier();
+        } catch (BukkitCommandManager.BrigadierInitializationException e) {
+            geyserLogger.debug("Failed to initialize Brigadier support: " + e.getMessage());
         }
 
         this.commandRegistry = new SpigotCommandRegistry(geyser, cloud);
diff --git a/core/src/main/java/org/geysermc/geyser/Permissions.java b/core/src/main/java/org/geysermc/geyser/Permissions.java
index 955bcfa82..b65a5af7a 100644
--- a/core/src/main/java/org/geysermc/geyser/Permissions.java
+++ b/core/src/main/java/org/geysermc/geyser/Permissions.java
@@ -35,7 +35,6 @@ import java.util.Map;
  * Permissions related to Geyser
  */
 public final class Permissions {
-
     private static final Map<String, TriState> PERMISSIONS = new HashMap<>();
 
     public static final String CHECK_UPDATE = register("geyser.update");
diff --git a/core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java b/core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java
index b419dee30..86a08be13 100644
--- a/core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java
@@ -39,7 +39,6 @@ import java.util.Collections;
 import java.util.List;
 
 public abstract class GeyserCommand implements org.geysermc.geyser.api.command.Command {
-
     public static final String DEFAULT_ROOT_COMMAND = "geyser";
 
     /**