Commands

paper-server/patches/unapplied/net/minecraft/commands/CommandSource.java.patch

@@ -1,23 +0,0 @@
---- a/net/minecraft/commands/CommandSource.java
-+++ b/net/minecraft/commands/CommandSource.java
-@@ -22,6 +22,13 @@
-         public boolean shouldInformAdmins() {
-             return false;
-         }
-+
-+        // CraftBukkit start
-+        @Override
-+        public org.bukkit.command.CommandSender getBukkitSender(CommandSourceStack wrapper) {
-+            return io.papermc.paper.brigadier.NullCommandSender.INSTANCE; // Paper - expose a no-op CommandSender
-+        }
-+        // CraftBukkit end
-     };
- 
-     void sendSystemMessage(Component message);
-@@ -35,4 +42,6 @@
-     default boolean alwaysAccepts() {
-         return false;
-     }
-+
-+    org.bukkit.command.CommandSender getBukkitSender(CommandSourceStack wrapper); // CraftBukkit
- }

paper-server/patches/unapplied/net/minecraft/commands/CommandSourceStack.java.patch

@@ -1,114 +0,0 @@
---- a/net/minecraft/commands/CommandSourceStack.java
-+++ b/net/minecraft/commands/CommandSourceStack.java
-@@ -45,9 +45,9 @@
- import net.minecraft.world.level.dimension.DimensionType;
- import net.minecraft.world.phys.Vec2;
- import net.minecraft.world.phys.Vec3;
-+import com.mojang.brigadier.tree.CommandNode; // CraftBukkit
- 
--public class CommandSourceStack implements ExecutionCommandSource<CommandSourceStack>, SharedSuggestionProvider {
--
-+public class CommandSourceStack implements ExecutionCommandSource<CommandSourceStack>, SharedSuggestionProvider, io.papermc.paper.command.brigadier.PaperCommandSourceStack { // Paper - Brigadier API
-     public static final SimpleCommandExceptionType ERROR_NOT_PLAYER = new SimpleCommandExceptionType(Component.translatable("permissions.requires.player"));
-     public static final SimpleCommandExceptionType ERROR_NOT_ENTITY = new SimpleCommandExceptionType(Component.translatable("permissions.requires.entity"));
-     public final CommandSource source;
-@@ -65,6 +65,8 @@
-     private final Vec2 rotation;
-     private final CommandSigningContext signingContext;
-     private final TaskChainer chatMessageChainer;
-+    public java.util.Map<Thread, CommandNode> currentCommand = new java.util.concurrent.ConcurrentHashMap<>(); // CraftBukkit // Paper - Thread Safe Vanilla Command permission checking
-+    public boolean bypassSelectorPermissions = false; // Paper - add bypass for selector permissions
- 
-     public CommandSourceStack(CommandSource output, Vec3 pos, Vec2 rot, ServerLevel world, int level, String name, Component displayName, MinecraftServer server, @Nullable Entity entity) {
-         this(output, pos, rot, world, level, name, displayName, server, entity, false, CommandResultCallback.EMPTY, EntityAnchorArgument.Anchor.FEET, CommandSigningContext.ANONYMOUS, TaskChainer.immediate(server));
-@@ -171,8 +173,43 @@
- 
-     @Override
-     public boolean hasPermission(int level) {
-+        // CraftBukkit start
-+        // Paper start - Thread Safe Vanilla Command permission checking
-+        CommandNode currentCommand = this.currentCommand.get(Thread.currentThread());
-+        if (currentCommand != null) {
-+            return this.hasPermission(level, org.bukkit.craftbukkit.command.VanillaCommandWrapper.getPermission(currentCommand));
-+            // Paper end - Thread Safe Vanilla Command permission checking
-+        }
-+        // CraftBukkit end
-+
-         return this.permissionLevel >= level;
-+    }
-+
-+    // Paper start - Fix permission levels for command blocks
-+    private boolean forceRespectPermissionLevel() {
-+        return this.source == CommandSource.NULL || (this.source instanceof final net.minecraft.world.level.BaseCommandBlock commandBlock && commandBlock.getLevel().paperConfig().commandBlocks.forceFollowPermLevel);
-+    }
-+    // Paper end - Fix permission levels for command blocks
-+
-+    // CraftBukkit start
-+    public boolean hasPermission(int i, String bukkitPermission) {
-+        // Paper start - Fix permission levels for command blocks
-+        final java.util.function.BooleanSupplier hasBukkitPerm = () -> this.source == CommandSource.NULL /*treat NULL as having all bukkit perms*/ || this.getBukkitSender().hasPermission(bukkitPermission); // lazily check bukkit perms to the benefit of custom permission setups
-+        // if the server is null, we must check the vanilla perm level system
-+        // if ignoreVanillaPermissions is true, we can skip vanilla perms and just run the bukkit perm check
-+        //noinspection ConstantValue
-+        if (this.getServer() == null || !this.getServer().server.ignoreVanillaPermissions) { // server & level are null for command function loading
-+            final boolean hasPermLevel = this.permissionLevel >= i;
-+            if (this.forceRespectPermissionLevel()) { // NULL CommandSource and command blocks (if setting is enabled) should always pass the vanilla perm check
-+                return hasPermLevel && hasBukkitPerm.getAsBoolean();
-+            } else { // otherwise check vanilla perm first then bukkit perm, matching upstream behavior
-+                return hasPermLevel || hasBukkitPerm.getAsBoolean();
-+            }
-+        }
-+        return hasBukkitPerm.getAsBoolean();
-+        // Paper end - Fix permission levels for command blocks
-     }
-+    // CraftBukkit end
- 
-     public Vec3 getPosition() {
-         return this.worldPosition;
-@@ -302,21 +339,26 @@
-             while (iterator.hasNext()) {
-                 ServerPlayer entityplayer = (ServerPlayer) iterator.next();
- 
--                if (entityplayer.commandSource() != this.source && this.server.getPlayerList().isOp(entityplayer.getGameProfile())) {
-+                if (entityplayer.commandSource() != this.source && entityplayer.getBukkitEntity().hasPermission("minecraft.admin.command_feedback")) { // CraftBukkit
-                     entityplayer.sendSystemMessage(ichatmutablecomponent);
-                 }
-             }
-         }
- 
--        if (this.source != this.server && this.server.getGameRules().getBoolean(GameRules.RULE_LOGADMINCOMMANDS)) {
-+        if (this.source != this.server && this.server.getGameRules().getBoolean(GameRules.RULE_LOGADMINCOMMANDS) && !org.spigotmc.SpigotConfig.silentCommandBlocks) { // Spigot
-             this.server.sendSystemMessage(ichatmutablecomponent);
-         }
- 
-     }
- 
-     public void sendFailure(Component message) {
-+        // Paper start - Add UnknownCommandEvent
-+        this.sendFailure(message, true);
-+    }
-+    public void sendFailure(Component message, boolean withStyle) {
-+        // Paper end - Add UnknownCommandEvent
-         if (this.source.acceptsFailure() && !this.silent) {
--            this.source.sendSystemMessage(Component.empty().append(message).withStyle(ChatFormatting.RED));
-+            this.source.sendSystemMessage(withStyle ? Component.empty().append(message).withStyle(ChatFormatting.RED) : message); // Paper - Add UnknownCommandEvent
-         }
- 
-     }
-@@ -400,4 +442,16 @@
-     public boolean isSilent() {
-         return this.silent;
-     }
-+
-+    // Paper start
-+    @Override
-+    public CommandSourceStack getHandle() {
-+        return this;
-+    }
-+    // Paper end
-+    // CraftBukkit start
-+    public org.bukkit.command.CommandSender getBukkitSender() {
-+        return this.source.getBukkitSender(this);
-+    }
-+    // CraftBukkit end
- }

paper-server/patches/unapplied/net/minecraft/commands/Commands.java.patch

@@ -1,372 +0,0 @@
---- a/net/minecraft/commands/Commands.java
-+++ b/net/minecraft/commands/Commands.java
-@@ -138,6 +138,14 @@
- import net.minecraft.world.flag.FeatureFlags;
- import net.minecraft.world.level.GameRules;
- import org.slf4j.Logger;
-+
-+// CraftBukkit start
-+import com.google.common.base.Joiner;
-+import java.util.Collection;
-+import java.util.LinkedHashSet;
-+import org.bukkit.event.player.PlayerCommandSendEvent;
-+import org.bukkit.event.server.ServerCommandEvent;
-+// CraftBukkit end
- 
- public class Commands {
- 
-@@ -151,6 +159,7 @@
-     private final com.mojang.brigadier.CommandDispatcher<CommandSourceStack> dispatcher = new com.mojang.brigadier.CommandDispatcher();
- 
-     public Commands(Commands.CommandSelection environment, CommandBuildContext commandRegistryAccess) {
-+        // Paper
-         AdvancementCommands.register(this.dispatcher);
-         AttributeCommand.register(this.dispatcher, commandRegistryAccess);
-         ExecuteCommand.register(this.dispatcher, commandRegistryAccess);
-@@ -250,8 +259,33 @@
- 
-         if (environment.includeIntegrated) {
-             PublishCommand.register(this.dispatcher);
-+        }
-+
-+        // Paper start - Vanilla command permission fixes
-+        for (final CommandNode<CommandSourceStack> node : this.dispatcher.getRoot().getChildren()) {
-+            if (node.getRequirement() == com.mojang.brigadier.builder.ArgumentBuilder.<CommandSourceStack>defaultRequirement()) {
-+                node.requirement = stack -> stack.source == CommandSource.NULL || stack.getBukkitSender().hasPermission(org.bukkit.craftbukkit.command.VanillaCommandWrapper.getPermission(node));
-+            }
-         }
-+        // Paper end - Vanilla command permission fixes
-+        // Paper start - Brigadier Command API
-+        // Create legacy minecraft namespace commands
-+        for (final CommandNode<CommandSourceStack> node : new java.util.ArrayList<>(this.dispatcher.getRoot().getChildren())) {
-+            // The brigadier dispatcher is not able to resolve nested redirects.
-+            // E.g. registering the alias minecraft:tp cannot redirect to tp, as tp itself redirects to teleport.
-+            // Instead, target the first none redirecting node.
-+            CommandNode<CommandSourceStack> flattenedAliasTarget = node;
-+            while (flattenedAliasTarget.getRedirect() != null) flattenedAliasTarget = flattenedAliasTarget.getRedirect();
- 
-+            this.dispatcher.register(
-+                com.mojang.brigadier.builder.LiteralArgumentBuilder.<CommandSourceStack>literal("minecraft:" + node.getName())
-+                    .executes(flattenedAliasTarget.getCommand())
-+                    .requires(flattenedAliasTarget.getRequirement())
-+                    .redirect(flattenedAliasTarget)
-+            );
-+        }
-+        // Paper end - Brigadier Command API
-+        // Paper - remove public constructor, no longer needed
-         this.dispatcher.setConsumer(ExecutionCommandSource.resultConsumer());
-     }
- 
-@@ -262,30 +296,72 @@
-         return new ParseResults(commandcontextbuilder1, parseResults.getReader(), parseResults.getExceptions());
-     }
- 
-+    // CraftBukkit start
-+    public void dispatchServerCommand(CommandSourceStack sender, String command) {
-+        Joiner joiner = Joiner.on(" ");
-+        if (command.startsWith("/")) {
-+            command = command.substring(1);
-+        }
-+
-+        ServerCommandEvent event = new ServerCommandEvent(sender.getBukkitSender(), command);
-+        org.bukkit.Bukkit.getPluginManager().callEvent(event);
-+        if (event.isCancelled()) {
-+            return;
-+        }
-+        command = event.getCommand();
-+
-+        String[] args = command.split(" ");
-+        if (args.length == 0) return; // Paper - empty commands shall not be dispatched
-+
-+        // Paper - Fix permission levels for command blocks
-+
-+        // Handle vanilla commands; // Paper - handled in CommandNode/CommandDispatcher
-+
-+        String newCommand = joiner.join(args);
-+        this.performPrefixedCommand(sender, newCommand, newCommand);
-+    }
-+    // CraftBukkit end
-+
-     public void performPrefixedCommand(CommandSourceStack source, String command) {
--        command = command.startsWith("/") ? command.substring(1) : command;
--        this.performCommand(this.dispatcher.parse(command, source), command);
-+        // CraftBukkit start
-+        this.performPrefixedCommand(source, command, command);
-+    }
-+
-+    public void performPrefixedCommand(CommandSourceStack commandlistenerwrapper, String s, String label) {
-+        s = s.startsWith("/") ? s.substring(1) : s;
-+        this.performCommand(this.dispatcher.parse(s, commandlistenerwrapper), s, label);
-+        // CraftBukkit end
-     }
- 
-     public void performCommand(ParseResults<CommandSourceStack> parseResults, String command) {
--        CommandSourceStack commandlistenerwrapper = (CommandSourceStack) parseResults.getContext().getSource();
-+        this.performCommand(parseResults, command, command);
-+    }
- 
-+    public void performCommand(ParseResults<CommandSourceStack> parseresults, String s, String label) { // CraftBukkit
-+        // Paper start
-+        this.performCommand(parseresults, s, label, false);
-+    }
-+    public void performCommand(ParseResults<CommandSourceStack> parseresults, String s, String label, boolean throwCommandError) {
-+        // Paper end
-+        CommandSourceStack commandlistenerwrapper = (CommandSourceStack) parseresults.getContext().getSource();
-+
-         Profiler.get().push(() -> {
--            return "/" + command;
-+            return "/" + s;
-         });
--        ContextChain<CommandSourceStack> contextchain = Commands.finishParsing(parseResults, command, commandlistenerwrapper);
-+        ContextChain contextchain = this.finishParsing(parseresults, s, commandlistenerwrapper, label); // CraftBukkit // Paper - Add UnknownCommandEvent
- 
-         try {
-             if (contextchain != null) {
-                 Commands.executeCommandInContext(commandlistenerwrapper, (executioncontext) -> {
--                    ExecutionContext.queueInitialCommandExecution(executioncontext, command, contextchain, commandlistenerwrapper, CommandResultCallback.EMPTY);
-+                    ExecutionContext.queueInitialCommandExecution(executioncontext, s, contextchain, commandlistenerwrapper, CommandResultCallback.EMPTY);
-                 });
-             }
-         } catch (Exception exception) {
-+            if (throwCommandError) throw exception;
-             MutableComponent ichatmutablecomponent = Component.literal(exception.getMessage() == null ? exception.getClass().getName() : exception.getMessage());
- 
--            if (Commands.LOGGER.isDebugEnabled()) {
--                Commands.LOGGER.error("Command exception: /{}", command, exception);
-+            Commands.LOGGER.error("Command exception: /{}", s, exception); // Paper - always show execution exception in console log
-+            if (commandlistenerwrapper.getServer().isDebugging() || Commands.LOGGER.isDebugEnabled()) { // Paper - Debugging
-                 StackTraceElement[] astacktraceelement = exception.getStackTrace();
- 
-                 for (int i = 0; i < Math.min(astacktraceelement.length, 3); ++i) {
-@@ -298,7 +374,7 @@
-             }));
-             if (SharedConstants.IS_RUNNING_IN_IDE) {
-                 commandlistenerwrapper.sendFailure(Component.literal(Util.describeError(exception)));
--                Commands.LOGGER.error("'/{}' threw an exception", command, exception);
-+                Commands.LOGGER.error("'/{}' threw an exception", s, exception);
-             }
-         } finally {
-             Profiler.get().pop();
-@@ -307,18 +383,22 @@
-     }
- 
-     @Nullable
--    private static ContextChain<CommandSourceStack> finishParsing(ParseResults<CommandSourceStack> parseResults, String command, CommandSourceStack source) {
-+    private ContextChain<CommandSourceStack> finishParsing(ParseResults<CommandSourceStack> parseresults, String s, CommandSourceStack commandlistenerwrapper, String label) { // CraftBukkit // Paper - Add UnknownCommandEvent
-         try {
--            Commands.validateParseResults(parseResults);
--            return (ContextChain) ContextChain.tryFlatten(parseResults.getContext().build(command)).orElseThrow(() -> {
--                return CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand().createWithContext(parseResults.getReader());
-+            Commands.validateParseResults(parseresults);
-+            return (ContextChain) ContextChain.tryFlatten(parseresults.getContext().build(s)).orElseThrow(() -> {
-+                return CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand().createWithContext(parseresults.getReader());
-             });
-         } catch (CommandSyntaxException commandsyntaxexception) {
--            source.sendFailure(ComponentUtils.fromMessage(commandsyntaxexception.getRawMessage()));
-+            // Paper start - Add UnknownCommandEvent
-+            final net.kyori.adventure.text.TextComponent.Builder builder = net.kyori.adventure.text.Component.text();
-+            // commandlistenerwrapper.sendFailure(ComponentUtils.fromMessage(commandsyntaxexception.getRawMessage()));
-+            builder.color(net.kyori.adventure.text.format.NamedTextColor.RED).append(io.papermc.paper.brigadier.PaperBrigadier.componentFromMessage(commandsyntaxexception.getRawMessage()));
-+            // Paper end - Add UnknownCommandEvent
-             if (commandsyntaxexception.getInput() != null && commandsyntaxexception.getCursor() >= 0) {
-                 int i = Math.min(commandsyntaxexception.getInput().length(), commandsyntaxexception.getCursor());
-                 MutableComponent ichatmutablecomponent = Component.empty().withStyle(ChatFormatting.GRAY).withStyle((chatmodifier) -> {
--                    return chatmodifier.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + command));
-+                    return chatmodifier.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + label)); // CraftBukkit // Paper
-                 });
- 
-                 if (i > 10) {
-@@ -333,8 +413,18 @@
-                 }
- 
-                 ichatmutablecomponent.append((Component) Component.translatable("command.context.here").withStyle(ChatFormatting.RED, ChatFormatting.ITALIC));
--                source.sendFailure(ichatmutablecomponent);
-+                // Paper start - Add UnknownCommandEvent
-+                // commandlistenerwrapper.sendFailure(ichatmutablecomponent);
-+                builder
-+                    .append(net.kyori.adventure.text.Component.newline())
-+                    .append(io.papermc.paper.adventure.PaperAdventure.asAdventure(ichatmutablecomponent));
-             }
-+            org.bukkit.event.command.UnknownCommandEvent event = new org.bukkit.event.command.UnknownCommandEvent(commandlistenerwrapper.getBukkitSender(), s, org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty() ? null : builder.build());
-+            org.bukkit.Bukkit.getServer().getPluginManager().callEvent(event);
-+            if (event.message() != null) {
-+                commandlistenerwrapper.sendFailure(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.message()), false);
-+                // Paper end - Add UnknownCommandEvent
-+            }
- 
-             return null;
-         }
-@@ -368,7 +458,7 @@
- 
-                 executioncontext1.close();
-             } finally {
--                Commands.CURRENT_EXECUTION_CONTEXT.set((Object) null);
-+                Commands.CURRENT_EXECUTION_CONTEXT.set(null); // CraftBukkit - decompile error
-             }
-         } else {
-             callback.accept(executioncontext);
-@@ -377,30 +467,133 @@
-     }
- 
-     public void sendCommands(ServerPlayer player) {
--        Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> map = Maps.newHashMap();
-+        // Paper start - Send empty commands if tab completion is disabled
-+        if (org.spigotmc.SpigotConfig.tabComplete < 0) {
-+            player.connection.send(new ClientboundCommandsPacket(new RootCommandNode<>()));
-+            return;
-+        }
-+        // Paper end - Send empty commands if tab completion is disabled
-+        // CraftBukkit start
-+        // Register Vanilla commands into builtRoot as before
-+        // Paper start - Perf: Async command map building
-+        // Copy root children to avoid concurrent modification during building
-+        final Collection<CommandNode<CommandSourceStack>> commandNodes = new java.util.ArrayList<>(this.dispatcher.getRoot().getChildren());
-+        COMMAND_SENDING_POOL.execute(() -> this.sendAsync(player, commandNodes));
-+    }
-+
-+    // Fixed pool, but with discard policy
-+    public static final java.util.concurrent.ExecutorService COMMAND_SENDING_POOL = new java.util.concurrent.ThreadPoolExecutor(
-+        2, 2, 0, java.util.concurrent.TimeUnit.MILLISECONDS,
-+        new java.util.concurrent.LinkedBlockingQueue<>(),
-+        new com.google.common.util.concurrent.ThreadFactoryBuilder()
-+            .setNameFormat("Paper Async Command Builder Thread Pool - %1$d")
-+            .setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER))
-+            .build(),
-+        new java.util.concurrent.ThreadPoolExecutor.DiscardPolicy()
-+    );
-+
-+    private void sendAsync(ServerPlayer player, Collection<CommandNode<CommandSourceStack>> dispatcherRootChildren) {
-+        // Paper end - Perf: Async command map building
-+        Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> map = Maps.newIdentityHashMap(); // Use identity to prevent aliasing issues
-+        // Paper - brigadier API removes the need to fill the map twice
-         RootCommandNode<SharedSuggestionProvider> rootcommandnode = new RootCommandNode();
- 
-         map.put(this.dispatcher.getRoot(), rootcommandnode);
--        this.fillUsableCommands(this.dispatcher.getRoot(), rootcommandnode, player.createCommandSourceStack(), map);
-+        this.fillUsableCommands(dispatcherRootChildren, rootcommandnode, player.createCommandSourceStack(), map); // Paper - Perf: Async command map building; pass copy of children
-+
-+        Collection<String> bukkit = new LinkedHashSet<>();
-+        for (CommandNode node : rootcommandnode.getChildren()) {
-+            bukkit.add(node.getName());
-+        }
-+        // Paper start - Perf: Async command map building
-+        new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper - Brigadier API
-+        net.minecraft.server.MinecraftServer.getServer().execute(() -> {
-+           runSync(player, bukkit, rootcommandnode);
-+        });
-+    }
-+
-+    private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
-+        // Paper end - Perf: Async command map building
-+        new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, true).callEvent(); // Paper - Brigadier API
-+        PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
-+        event.getPlayer().getServer().getPluginManager().callEvent(event);
-+
-+        // Remove labels that were removed during the event
-+        for (String orig : bukkit) {
-+            if (!event.getCommands().contains(orig)) {
-+                rootcommandnode.removeCommand(orig);
-+            }
-+        }
-+        // CraftBukkit end
-         player.connection.send(new ClientboundCommandsPacket(rootcommandnode));
-     }
- 
--    private void fillUsableCommands(CommandNode<CommandSourceStack> tree, CommandNode<SharedSuggestionProvider> result, CommandSourceStack source, Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> resultNodes) {
--        Iterator iterator = tree.getChildren().iterator();
-+    // Paper start - Perf: Async command map building; pass copy of children
-+    private void fillUsableCommands(Collection<CommandNode<CommandSourceStack>> children, CommandNode<SharedSuggestionProvider> result, CommandSourceStack source, Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> resultNodes) {
-+        resultNodes.keySet().removeIf((node) -> !org.spigotmc.SpigotConfig.sendNamespaced && node.getName().contains( ":" )); // Paper - Remove namedspaced from result nodes to prevent redirect trimming ~ see comment below
-+        Iterator iterator = children.iterator();
-+        // Paper end - Perf: Async command map building
- 
-         while (iterator.hasNext()) {
-             CommandNode<CommandSourceStack> commandnode2 = (CommandNode) iterator.next();
-+            // Paper start - Brigadier API
-+            if (commandnode2.clientNode != null) {
-+                commandnode2 = commandnode2.clientNode;
-+            }
-+            // Paper end - Brigadier API
-+            if ( !org.spigotmc.SpigotConfig.sendNamespaced && commandnode2.getName().contains( ":" ) ) continue; // Spigot
- 
-             if (commandnode2.canUse(source)) {
--                ArgumentBuilder<SharedSuggestionProvider, ?> argumentbuilder = commandnode2.createBuilder();
-+                ArgumentBuilder argumentbuilder = commandnode2.createBuilder(); // CraftBukkit - decompile error
-+                // Paper start
-+                /*
-+                Because of how commands can be yeeted right left and center due to bad bukkit practices
-+                we need to be able to ensure that ALL commands are registered (even redirects).
- 
-+                What this will do is IF the redirect seems to be "dead" it will create a builder and essentially populate (flatten)
-+                all the children from the dead redirect to the node.
-+
-+                So, if minecraft:msg redirects to msg but the original msg node has been overriden minecraft:msg will now act as msg and will explicilty inherit its children.
-+
-+                The only way to fix this is to either:
-+                - Send EVERYTHING flattened, don't use redirects
-+                - Don't allow command nodes to be deleted
-+                - Do this :)
-+                 */
-+
-+                // Is there an invalid command redirect?
-+                if (argumentbuilder.getRedirect() != null && (CommandNode) resultNodes.get(argumentbuilder.getRedirect()) == null) {
-+                    // Create the argument builder with the same values as the specified node, but with a different literal and populated children
-+
-+                    CommandNode<CommandSourceStack> redirect = argumentbuilder.getRedirect();
-+                    // Diff copied from LiteralCommand#createBuilder
-+                    final com.mojang.brigadier.builder.LiteralArgumentBuilder<CommandSourceStack> builder = com.mojang.brigadier.builder.LiteralArgumentBuilder.literal(commandnode2.getName());
-+                    builder.requires(redirect.getRequirement());
-+                    // builder.forward(redirect.getRedirect(), redirect.getRedirectModifier(), redirect.isFork()); We don't want to migrate the forward, since it's invalid.
-+                    if (redirect.getCommand() != null) {
-+                        builder.executes(redirect.getCommand());
-+                    }
-+                    // Diff copied from LiteralCommand#createBuilder
-+                    for (CommandNode<CommandSourceStack> child : redirect.getChildren()) {
-+                        builder.then(child);
-+                    }
-+
-+                    argumentbuilder = builder;
-+                }
-+                // Paper end
-+
-                 argumentbuilder.requires((icompletionprovider) -> {
-                     return true;
-                 });
-                 if (argumentbuilder.getCommand() != null) {
--                    argumentbuilder.executes((commandcontext) -> {
--                        return 0;
-+                    // Paper start - fix suggestions due to falsely equal nodes
-+                    argumentbuilder.executes(new com.mojang.brigadier.Command<io.papermc.paper.command.brigadier.CommandSourceStack>() {
-+                        @Override
-+                        public int run(com.mojang.brigadier.context.CommandContext<io.papermc.paper.command.brigadier.CommandSourceStack> commandContext) throws CommandSyntaxException {
-+                            return 0;
-+                        }
-                     });
-+                    // Paper end
-                 }
- 
-                 if (argumentbuilder instanceof RequiredArgumentBuilder) {
-@@ -415,12 +608,12 @@
-                     argumentbuilder.redirect((CommandNode) resultNodes.get(argumentbuilder.getRedirect()));
-                 }
- 
--                CommandNode<SharedSuggestionProvider> commandnode3 = argumentbuilder.build();
-+                CommandNode commandnode3 = argumentbuilder.build(); // CraftBukkit - decompile error
- 
-                 resultNodes.put(commandnode2, commandnode3);
-                 result.addChild(commandnode3);
-                 if (!commandnode2.getChildren().isEmpty()) {
--                    this.fillUsableCommands(commandnode2, commandnode3, source, resultNodes);
-+                    this.fillUsableCommands(commandnode2.getChildren(), commandnode3, source, resultNodes); // Paper - Perf: Async command map building; pass children directly
-                 }
-             }
-         }
-@@ -481,7 +674,7 @@
-             }
- 
-             private <T> HolderLookup.RegistryLookup.Delegate<T> createLookup(final HolderLookup.RegistryLookup<T> original) {
--                return new HolderLookup.RegistryLookup.Delegate<T>(this) {
-+                return new HolderLookup.RegistryLookup.Delegate<T>() { // CraftBukkit - decompile error
-                     @Override
-                     public HolderLookup.RegistryLookup<T> parent() {
-                         return original;

paper-server/patches/unapplied/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java.patch

@@ -1,11 +0,0 @@
---- a/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
-+++ b/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
-@@ -39,7 +39,7 @@
- 
-     @Override
-     public Path createPath(Entity entity, int distance) {
--        return this.createPath(entity.blockPosition(), distance);
-+        return this.createPath(entity.blockPosition(), entity, distance); // Paper - EntityPathfindEvent
-     }
- 
-     @Override

paper-server/patches/unapplied/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java.patch

@@ -1,46 +0,0 @@
---- a/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
-+++ b/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
-@@ -41,7 +41,7 @@
-     }
- 
-     @Override
--    public Path createPath(BlockPos target, int distance) {
-+    public Path createPath(BlockPos target, @javax.annotation.Nullable Entity entity, int distance) { // Paper - EntityPathfindEvent
-         LevelChunk levelChunk = this.level
-             .getChunkSource()
-             .getChunkNow(SectionPos.blockToSectionCoord(target.getX()), SectionPos.blockToSectionCoord(target.getZ()));
-@@ -56,7 +56,7 @@
-                 }
- 
-                 if (mutableBlockPos.getY() > this.level.getMinY()) {
--                    return super.createPath(mutableBlockPos.above(), distance);
-+                    return super.createPath(mutableBlockPos.above(), entity, distance); // Paper - EntityPathfindEvent
-                 }
- 
-                 mutableBlockPos.setY(target.getY() + 1);
-@@ -69,7 +69,7 @@
-             }
- 
-             if (!levelChunk.getBlockState(target).isSolid()) {
--                return super.createPath(target, distance);
-+                return super.createPath(target, entity, distance); // Paper - EntityPathfindEvent
-             } else {
-                 BlockPos.MutableBlockPos mutableBlockPos2 = target.mutable().move(Direction.UP);
- 
-@@ -77,14 +77,14 @@
-                     mutableBlockPos2.move(Direction.UP);
-                 }
- 
--                return super.createPath(mutableBlockPos2.immutable(), distance);
-+                return super.createPath(mutableBlockPos2.immutable(), entity, distance);  // Paper - EntityPathfindEvent
-             }
-         }
-     }
- 
-     @Override
-     public Path createPath(Entity entity, int distance) {
--        return this.createPath(entity.blockPosition(), distance);
-+        return this.createPath(entity.blockPosition(), entity, distance); // Paper - EntityPathfindEvent
-     }
- 
-     private int getSurfaceY() {

paper-server/patches/unapplied/net/minecraft/world/entity/ai/navigation/PathNavigation.java.patch

@@ -1,104 +0,0 @@
---- a/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-+++ b/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-@@ -125,8 +125,14 @@
- 
-     @Nullable
-     public Path createPath(BlockPos target, int distance) {
--        return this.createPath(ImmutableSet.of(target), 8, false, distance);
-+        // Paper start - EntityPathfindEvent
-+        return this.createPath(target, null, distance);
-     }
-+    @Nullable
-+    public Path createPath(BlockPos target, @Nullable Entity entity, int distance) {
-+        return this.createPath(ImmutableSet.of(target), entity, 8, false, distance);
-+        // Paper end - EntityPathfindEvent
-+    }
- 
-     @Nullable
-     public Path createPath(BlockPos target, int minDistance, int maxDistance) {
-@@ -135,7 +141,7 @@
- 
-     @Nullable
-     public Path createPath(Entity entity, int distance) {
--        return this.createPath(ImmutableSet.of(entity.blockPosition()), 16, true, distance);
-+        return this.createPath(ImmutableSet.of(entity.blockPosition()), entity, 16, true, distance); // Paper - EntityPathfindEvent
-     }
- 
-     @Nullable
-@@ -145,6 +151,17 @@
- 
-     @Nullable
-     protected Path createPath(Set<BlockPos> positions, int range, boolean useHeadPos, int distance, float followRange) {
-+        // Paper start - EntityPathfindEvent
-+        return this.createPath(positions, null, range, useHeadPos, distance, followRange);
-+    }
-+
-+    @Nullable
-+    protected Path createPath(Set<BlockPos> positions, @Nullable Entity target, int range, boolean useHeadPos, int distance) {
-+        return this.createPath(positions, target, range, useHeadPos, distance, (float) this.mob.getAttributeValue(Attributes.FOLLOW_RANGE));
-+    }
-+
-+    @Nullable protected Path createPath(Set<BlockPos> positions, @Nullable Entity target, int range, boolean useHeadPos, int distance, float followRange) {
-+        // Paper end - EntityPathfindEvent
-         if (positions.isEmpty()) {
-             return null;
-         } else if (this.mob.getY() < (double)this.level.getMinY()) {
-@@ -154,6 +171,23 @@
-         } else if (this.path != null && !this.path.isDone() && positions.contains(this.targetPos)) {
-             return this.path;
-         } else {
-+            // Paper start - EntityPathfindEvent
-+            boolean copiedSet = false;
-+            for (BlockPos possibleTarget : positions) {
-+                if (!this.mob.getCommandSenderWorld().getWorldBorder().isWithinBounds(possibleTarget) || !new com.destroystokyo.paper.event.entity.EntityPathfindEvent(this.mob.getBukkitEntity(), // Paper - don't path out of world border
-+                    io.papermc.paper.util.MCUtil.toLocation(this.mob.level(), possibleTarget), target == null ? null : target.getBukkitEntity()).callEvent()) {
-+                    if (!copiedSet) {
-+                        copiedSet = true;
-+                        positions = new java.util.HashSet<>(positions);
-+                    }
-+                    // note: since we copy the set this remove call is safe, since we're iterating over the old copy
-+                    positions.remove(possibleTarget);
-+                    if (positions.isEmpty()) {
-+                        return null;
-+                    }
-+                }
-+            }
-+            // Paper end - EntityPathfindEvent
-             ProfilerFiller profilerFiller = Profiler.get();
-             profilerFiller.push("pathfind");
-             BlockPos blockPos = useHeadPos ? this.mob.blockPosition().above() : this.mob.blockPosition();
-@@ -175,13 +209,33 @@
-         return this.moveTo(this.createPath(x, y, z, 1), speed);
-     }
- 
-+    // Paper start - Perf: Optimise pathfinding
-+    private int lastFailure = 0;
-+    private int pathfindFailures = 0;
-+    // Paper end - Perf: Optimise pathfinding
-+
-     public boolean moveTo(double x, double y, double z, int distance, double speed) {
-         return this.moveTo(this.createPath(x, y, z, distance), speed);
-     }
- 
-     public boolean moveTo(Entity entity, double speed) {
-+        // Paper start - Perf: Optimise pathfinding
-+        if (this.pathfindFailures > 10 && this.path == null && net.minecraft.server.MinecraftServer.currentTick < this.lastFailure + 40) {
-+            return false;
-+        }
-+        // Paper end - Perf: Optimise pathfinding
-         Path path = this.createPath(entity, 1);
--        return path != null && this.moveTo(path, speed);
-+        // Paper start - Perf: Optimise pathfinding
-+        if (path != null && this.moveTo(path, speed)) {
-+            this.lastFailure = 0;
-+            this.pathfindFailures = 0;
-+            return true;
-+        } else {
-+            this.pathfindFailures++;
-+            this.lastFailure = net.minecraft.server.MinecraftServer.currentTick;
-+            return false;
-+        }
-+        // Paper end - Perf: Optimise pathfinding
-     }
- 
-     public boolean moveTo(@Nullable Path path, double speed) {

paper-server/patches/unapplied/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java.patch

@@ -1,14 +0,0 @@
---- a/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
-+++ b/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
-@@ -16,9 +16,9 @@
-     }
- 
-     @Override
--    public Path createPath(BlockPos target, int distance) {
-+    public Path createPath(BlockPos target, @Nullable Entity entity, int distance) { // Paper - EntityPathfindEvent
-         this.pathToPosition = target;
--        return super.createPath(target, distance);
-+        return super.createPath(target, entity, distance); // Paper - EntityPathfindEvent
-     }
- 
-     @Override