Pass executor context properly for command block usage

Author: PrimordialMoros

fabric/src/main/java/me/moros/bending/fabric/platform/CommandSender.java

@@ -27,9 +27,11 @@
 
 public sealed class CommandSender implements ForwardingAudience.Single permits PlayerCommandSender {
   private final CommandSourceStack stack;
+  private final Audience audience;
 
-  private CommandSender(CommandSourceStack source) {
+  private CommandSender(CommandSourceStack source, Audience audience) {
     this.stack = source;
+    this.audience = audience;
   }
 
   public CommandSourceStack stack() {
@@ -38,19 +40,20 @@ public CommandSourceStack stack() {
 
   @Override
   public Audience audience() {
-    return stack;
+    return audience;
   }
 
   public static final class PlayerCommandSender extends CommandSender {
-    private PlayerCommandSender(CommandSourceStack stack) {
-      super(stack);
+    private PlayerCommandSender(CommandSourceStack stack, ServerPlayer player) {
+      super(stack, player);
     }
   }
 
   public static CommandSender from(CommandSourceStack stack) {
-    if (stack.getPlayer() instanceof ServerPlayer) {
-      return new PlayerCommandSender(stack);
+    ServerPlayer player = stack.getPlayer();
+    if (player != null) {
+      return new PlayerCommandSender(stack, player);
     }
-    return new CommandSender(stack);
+    return new CommandSender(stack, stack);
   }
 }

paper/src/main/java/me/moros/bending/paper/PaperBending.java

@@ -44,6 +44,8 @@
 import me.moros.bending.paper.platform.BrigadierSetup;
 import me.moros.bending.paper.platform.BukkitPermissionInitializer;
 import me.moros.bending.paper.platform.BukkitPlatform;
+import me.moros.bending.paper.platform.CommandSender;
+import me.moros.bending.paper.platform.CommandSender.PlayerCommandSender;
 import me.moros.bending.paper.protection.ProtectionInitializer;
 import me.moros.tasker.paper.PaperExecutor;
 import org.bstats.bukkit.Metrics;
@@ -53,8 +55,9 @@
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.ServicePriority;
+import org.incendo.cloud.SenderMapper;
 import org.incendo.cloud.execution.ExecutionCoordinator;
-import org.incendo.cloud.paper.LegacyPaperCommandManager;
+import org.incendo.cloud.paper.PaperCommandManager;
 
 final class PaperBending extends AbstractBending<BendingBootstrap> {
   PaperBending(BendingBootstrap parent, Path dir, Logger logger) {
@@ -76,10 +79,11 @@ void onPluginEnable() {
     pluginManager.registerEvents(new ConnectionListener(logger(), game), parent);
     pluginManager.registerEvents(new WorldListener(game), parent);
 
-    var manager = LegacyPaperCommandManager.createNative(parent, ExecutionCoordinator.simpleCoordinator());
-    manager.registerBrigadier();
+    var manager = PaperCommandManager.builder(SenderMapper.create(CommandSender::from, CommandSender::stack))
+      .executionCoordinator(ExecutionCoordinator.simpleCoordinator())
+      .buildOnEnable(parent);
     BrigadierSetup.setup(manager);
-    Commander.create(manager, Player.class, this).init();
+    Commander.create(manager, PlayerCommandSender.class, this).init();
 
     parent.getServer().getServicesManager().register(Game.class, game, parent, ServicePriority.Normal);
   }

paper/src/main/java/me/moros/bending/paper/platform/CommandSender.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020-2026 Moros
+ *
+ * This file is part of Bending.
+ *
+ * Bending is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Bending is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bending. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.moros.bending.paper.platform;
+
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import me.moros.bending.paper.platform.CommandSender.PlayerCommandSender;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.audience.ForwardingAudience;
+import org.bukkit.entity.Player;
+
+public sealed class CommandSender implements ForwardingAudience.Single permits PlayerCommandSender {
+  private final CommandSourceStack stack;
+  private final Audience audience;
+
+  private CommandSender(CommandSourceStack source, Audience audience) {
+    this.stack = source;
+    this.audience = audience;
+  }
+
+  public CommandSourceStack stack() {
+    return this.stack;
+  }
+
+  @Override
+  public Audience audience() {
+    return audience;
+  }
+
+  public static final class PlayerCommandSender extends CommandSender {
+    private PlayerCommandSender(CommandSourceStack stack, Player player) {
+      super(stack, player);
+    }
+  }
+
+  public static CommandSender from(CommandSourceStack stack) {
+    if (stack.getExecutor() instanceof Player player) {
+      return new PlayerCommandSender(stack, player);
+    } else if (stack.getSender() instanceof Player player) {
+      return new PlayerCommandSender(stack, player);
+    }
+    return new CommandSender(stack, stack.getSender());
+  }
+}