From 9a00802ed658047407a8b8d4f71c2a1ef5fecc1a Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 19 Jul 2026 19:53:52 -0700
Subject: [PATCH] fix(bukkit): restore selector permission bypass on 1.21.1+

Minecraft 1.21.1 added an allowSelectors parameter to EntityArgument's
internal parse overload. CraftBukkit consequently moved its existing
overridePermissions parameter to a three-argument overload.

Prefer that overload when available, while retaining the legacy
CraftBukkit overload for older Minecraft versions.

Refs #156
Supersedes #163

Co-authored-by: RootBeer <36140389+R00tB33rMan@users.noreply.github.com>
---
 .../bukkit/parser/selector/SelectorUtils.java | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/parser/selector/SelectorUtils.java b/cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/parser/selector/SelectorUtils.java
index f3254252..9fdc4bda 100644
--- a/cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/parser/selector/SelectorUtils.java
+++ b/cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/parser/selector/SelectorUtils.java
@@ -107,21 +107,50 @@ public Object apply(
                 final ArgumentType<Object> type,
                 final StringReader reader
         ) throws CommandSyntaxException {
-            final @Nullable Method specialParse = CraftBukkitReflection.findMethod(
+            // Minecraft 1.21.1 added allowSelectors to Vanilla's internal parse overload. CraftBukkit moved
+            // its existing overridePermissions parameter to a new three-argument overload to avoid a collision.
+            final @Nullable Method parseWithSelectorControl = CraftBukkitReflection.findMethod(
                     type.getClass(),
                     "parse",
                     StringReader.class,
+                    boolean.class,
                     boolean.class
             );
-            if (specialParse == null) {
-                return type.parse(reader);
+            if (parseWithSelectorControl != null) {
+                return invokeCraftBukkitParse(
+                        parseWithSelectorControl,
+                        type,
+                        reader,
+                        true, // allowSelectors
+                        true // overridePermissions
+                );
             }
-            try {
-                return specialParse.invoke(
+
+            // Before Minecraft 1.21.1, CraftBukkit's only additional parameter was overridePermissions.
+            final @Nullable Method parseWithPermissionOverride = CraftBukkitReflection.findMethod(
+                    type.getClass(),
+                    "parse",
+                    StringReader.class,
+                    boolean.class
+            );
+            if (parseWithPermissionOverride != null) {
+                return invokeCraftBukkitParse(
+                        parseWithPermissionOverride,
                         type,
                         reader,
-                        true // CraftBukkit overridePermissions param
+                        true // overridePermissions
                 );
+            }
+            return type.parse(reader);
+        }
+
+        private static Object invokeCraftBukkitParse(
+                final Method method,
+                final ArgumentType<Object> type,
+                final Object... arguments
+        ) throws CommandSyntaxException {
+            try {
+                return method.invoke(type, arguments);
             } catch (final InvocationTargetException ex) {
                 final Throwable cause = ex.getCause();
                 if (cause instanceof CommandSyntaxException) {