fix: apply cooldown after dispatch, escape MiniMessage in error messages, reuse PlaceholderStage

Author: objz

velocity/src/main/java/dev/objz/commandbridge/velocity/dispatch/CommandDispatcher.java

@@ -132,6 +132,7 @@ private Set<String> buildOPPermissions(Script script, CmdMapping currentCmd) {
     private void notifyExecutionError(CommandSource source, String command, String errorMessage) {
         if (source == null)
             return;
-        source.sendMessage(MM.parse("<red>⚠</red> <gray>Execution failed: " + errorMessage + "</gray>"));
+        String safe = errorMessage != null ? errorMessage.replace("<", "\\<") : "unknown";
+        source.sendMessage(MM.parse("<red>⚠</red> <gray>Execution failed: " + safe + "</gray>"));
     }
 }

velocity/src/main/java/dev/objz/commandbridge/velocity/dispatch/CommandEntry.java

@@ -56,6 +56,7 @@ public final class CommandEntry {
     private final UserCache userCache;
     private final List<Pipeline> pipelineStages;
     private final PlatformFeatures platformFeatures;
+    private final PlaceholderStage placeholderStage;
 
     public CommandEntry(
             ProxyServer proxy,
@@ -84,6 +85,7 @@ public CommandEntry(
         this.dispatcher = new CommandDispatcher(sessions, outNode, velocityExecutor, playerTracker);
 
         this.cooldowns = new CooldownManager();
+        this.placeholderStage = new PlaceholderStage(platformFeatures);
         this.pipelineStages = List.of(
                 new ScriptResolutionStage(scriptManager),
                 new ArgumentMappingStage(),
@@ -138,6 +140,12 @@ private void runPipelineStages(Iterator<Pipeline> stages, ExecutionContext ctx,
     }
 
     private void executeCommands(ExecutionContext ctx) {
+        if (ctx.script() != null && ctx.source() instanceof Player player) {
+            Duration scriptCooldown = ctx.script().defaults().cooldown();
+            if (scriptCooldown != null && !scriptCooldown.isZero()) {
+                cooldowns.setCooldown(ctx.script().name(), player.getUniqueId(), scriptCooldown);
+            }
+        }
         Optional.ofNullable(ctx.script())
                 .map(Script::commands)
                 .filter(Predicate.not(List::isEmpty))
@@ -161,15 +169,16 @@ private void processCommandAt(ExecutionContext ctx, List<CmdMapping> commands, i
             }
         }
 
-        new PlaceholderStage(platformFeatures).process(nextCtx, result -> {
+        placeholderStage.process(nextCtx, result -> {
             if (result instanceof ExecutionResult.Continue c) {
-                if (ctx.source() instanceof Player player && cmd.cooldown() != null
-                        && !cmd.cooldown().isZero() && !cmd.cooldown().isNegative()) {
-                    String cooldownKey = ctx.script().name() + ":" + index;
-                    cooldowns.setCooldown(cooldownKey, player.getUniqueId(), cmd.cooldown());
-                }
-                resolvePlayerArg(c.context()).thenAccept(resolved ->
-                        scheduleAndExecute(resolved, () -> processCommandAt(ctx, commands, index + 1)));
+                resolvePlayerArg(c.context()).thenAccept(resolved -> {
+                    if (ctx.source() instanceof Player player && cmd.cooldown() != null
+                            && !cmd.cooldown().isZero() && !cmd.cooldown().isNegative()) {
+                        String cooldownKey = ctx.script().name() + ":" + index;
+                        cooldowns.setCooldown(cooldownKey, player.getUniqueId(), cmd.cooldown());
+                    }
+                    scheduleAndExecute(resolved, () -> processCommandAt(ctx, commands, index + 1));
+                });
             }
         });
     }

velocity/src/main/java/dev/objz/commandbridge/velocity/dispatch/stage/CooldownStage.java

@@ -36,11 +36,6 @@ public void process(ExecutionContext context, Consumer<ExecutionResult> next) {
             return;
         }
 
-        Duration duration = script.defaults().cooldown();
-        if (duration != null && !duration.isZero()) {
-            cooldownManager.setCooldown(script.name(), player.getUniqueId(), duration);
-        }
-
         next.accept(ExecutionResult.ok(context));
     }
 }

velocity/src/main/java/dev/objz/commandbridge/velocity/net/in/ExecuteCommandHandler.java

@@ -81,11 +81,14 @@ private void notifyPlayer(UUID playerUuid, String command, String errorMessage,
                 MM.parse("<dark_gray>If this persists, please contact an administrator</dark_gray>"));
 
         if (player.hasPermission("commandbridge.admin")) {
-            player.sendMessage(MM.parse("<dark_gray>Command: </dark_gray><white>" + command + "</white>"));
-            player.sendMessage(MM.parse("<dark_gray>Backend: </dark_gray><white>" + clientId + "</white>"));
+            String safeCmd = command != null ? command.replace("<", "\\<") : "unknown";
+            String safeClient = clientId != null ? clientId.replace("<", "\\<") : "unknown";
+            player.sendMessage(MM.parse("<dark_gray>Command: </dark_gray><white>" + safeCmd + "</white>"));
+            player.sendMessage(MM.parse("<dark_gray>Backend: </dark_gray><white>" + safeClient + "</white>"));
             if (errorMessage != null) {
+                String safeError = errorMessage.replace("<", "\\<");
                 player.sendMessage(MM.parse(
-                        "<dark_gray>Error:  </dark_gray><red>" + errorMessage + "</red>"));
+                        "<dark_gray>Error:  </dark_gray><red>" + safeError + "</red>"));
             }
         }
     }