Skip to content

Allow PlayerSelectors via Brigadier using CB reflection #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
R00tB33rMan wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow PlayerSelectors via Brigadier using CB reflection #163

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8577134
Refactor selector logic to properly permit multiple selectors and sel…
R00tB33rMan Jun 28, 2026
4018bd5
Upstream
R00tB33rMan Jun 28, 2026
9347342
Assert definitions of booleans due to locative complexity
R00tB33rMan Jun 30, 2026
4383135
Merge branch 'master' into master
R00tB33rMan Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 33 additions & 8 deletions cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/parser/selector/SelectorUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,21 +107,46 @@ public Object apply(
final ArgumentType<Object> type,
final StringReader reader
) throws CommandSyntaxException {
final @Nullable Method specialParse = CraftBukkitReflection.findMethod(
final @Nullable Method modernParse = CraftBukkitReflection.findMethod(
type.getClass(),
"parse",
StringReader.class,
boolean.class,
boolean.class
);
if (specialParse == null) {
return type.parse(reader);
if (modernParse != null) {
return invokeParse(
modernParse,
type,
reader,
true, // CraftBukkit allowSelectors param
true // CraftBukkit overridePermissions param
);
}
try {
return specialParse.invoke(
type,
reader,
true // CraftBukkit overridePermissions param
final @Nullable Method legacyParse = CraftBukkitReflection.findMethod(
type.getClass(),
"parse",
StringReader.class,
boolean.class
);
if (legacyParse != null) {
return invokeParse(
legacyParse,
type,
reader,
true // CraftBukkit overridePermissions param
);
}
return type.parse(reader);
}

private static Object invokeParse(
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) {
Expand Down