View difference between Paste ID: VACM0h94 and z0eZEZ2m

-    private static Map<String, String> aliasToCanonicalNameMap = new HashMap<>();
+@Mixin(CommandManager.class)
 public abstract class CommandManagerExecuteMixin {
-    private void registerCommandAliases(CommandDispatcher<ServerCommandSource> dispatcher, Map<String, List<String>> configuredAliases) {
+
-        aliasToCanonicalNameMap.clear();
+    @Unique
     private static final ThreadLocal<Boolean> IS_ALIAS_REEXECUTION = ThreadLocal.withInitial(() -> false);
-        for (Map.Entry<String, List<String>> entry : configuredAliases.entrySet()) {
+
-            String canonicalCommandName = entry.getKey();
+    @Inject(method = "execute(Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;)V", at = @At("HEAD"), cancellable = true)
-            List<String> aliases = entry.getValue();
+    private void Fantasy$interceptCommandExecution(ParseResults<ServerCommandSource> parseResults, String commandString, CallbackInfo ci) {
-            CommandNode<ServerCommandSource> canonicalNode = dispatcher.getRoot().getChild(canonicalCommandName);
+        ServerCommandSource source = parseResults.getContext().getSource();
         ServerPlayerEntity sender = source.getPlayer();
-            if (canonicalNode == null) {
+
-                // Warning logged if canonical command not found
+        if (sender == null) {
-                continue;
+            return;
         }
 
-            for (String alias : aliases) {
+        boolean isRecursiveAliasCall = IS_ALIAS_REEXECUTION.get();
-                String cleanAlias = alias.startsWith("/") ? alias.substring(1) : alias;
+
-                dispatcher.register(CommandManager.literal(cleanAlias).redirect(canonicalNode));
+        String enteredCommandName = commandString.split(" ")[0].toLowerCase().replaceFirst("^/", "");
-                aliasToCanonicalNameMap.put(cleanAlias, canonicalCommandName);
+        String canonicalCommandName = CM.getAliasToCanonicalNameMap().get(enteredCommandName);
 
         if (canonicalCommandName != null && !isRecursiveAliasCall) {
             String argsPart = "";
             int firstSpace = commandString.indexOf(' ');
-    public static Map<String, String> getAliasToCanonicalNameMap() {
+            if (firstSpace != -1) {
-        return aliasToCanonicalNameMap;
+                argsPart = commandString.substring(firstSpace);
-    }
+
 
             String commandToExecute = canonicalCommandName + argsPart; // No leading slash for dispatcher.parse
 
             try {
                 CommandDispatcher<ServerCommandSource> dispatcher = CM.getDispatcher();
                 IS_ALIAS_REEXECUTION.set(true);
                 ParseResults<ServerCommandSource> canonicalParseResults = dispatcher.parse(commandToExecute, source);
                 dispatcher.execute(canonicalParseResults);
             } catch (Exception e) {
                 // Error handling for execution failures
             } finally {
                 IS_ALIAS_REEXECUTION.set(false);
             }
 
             ci.cancel();
             return;
         }
     }
 }