From 96e08ab2efc0dc4a974f69bd68db24d11625d1f5 Mon Sep 17 00:00:00 2001 From: jmp Date: Fri, 5 Feb 2021 18:05:21 -0800 Subject: [PATCH] fabric: register forwards mapper with the BrigadierManager fixes CommandSourceStack#getServer being null during permission checks for arguments with custom suggestions --- cloud-minecraft/cloud-fabric/build.gradle.kts | 2 +- .../cloud/commandframework/fabric/FabricCommandManager.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cloud-minecraft/cloud-fabric/build.gradle.kts b/cloud-minecraft/cloud-fabric/build.gradle.kts index 1031bfb0..07372f07 100644 --- a/cloud-minecraft/cloud-fabric/build.gradle.kts +++ b/cloud-minecraft/cloud-fabric/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { modImplementation("net.fabricmc", "fabric-loader", Versions.fabricLoader) modImplementation(fabricApi.module("fabric-command-api-v1", Versions.fabricApi)) - modImplementation(include("me.lucko", "fabric-permissions-api", "0.1-SNAPSHOT")) + modApi(include("me.lucko", "fabric-permissions-api", "0.1-SNAPSHOT")) api(include(project(":cloud-core"))!!) api(include(project(":cloud-brigadier"))!!) diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java index b68f32e8..2fd5591b 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/FabricCommandManager.java @@ -154,6 +154,7 @@ public abstract class FabricCommandManager extends C this )); this.brigadierManager.backwardsBrigadierSenderMapper(this.backwardsCommandSourceMapper); + this.brigadierManager.brigadierSenderMapper(this.commandSourceMapper); this.registerNativeBrigadierMappings(this.brigadierManager); this.setCaptionRegistry(new FabricCaptionRegistry<>()); this.registerCommandPreProcessor(new FabricCommandPreprocessor<>(this));