47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
--- a/net/minecraft/commands/arguments/selector/ArgumentParserSelector.java
|
|
+++ b/net/minecraft/commands/arguments/selector/ArgumentParserSelector.java
|
|
@@ -149,7 +149,7 @@
|
|
axisalignedbb = this.a(this.deltaX == null ? 0.0D : this.deltaX, this.deltaY == null ? 0.0D : this.deltaY, this.deltaZ == null ? 0.0D : this.deltaZ);
|
|
}
|
|
|
|
- Function function;
|
|
+ Function<Vec3D, Vec3D> function; // CraftBukkit - decompile error
|
|
|
|
if (this.x == null && this.y == null && this.z == null) {
|
|
function = (vec3d) -> {
|
|
@@ -206,8 +206,10 @@
|
|
};
|
|
}
|
|
|
|
- protected void parseSelector() throws CommandSyntaxException {
|
|
- this.usesSelectors = true;
|
|
+ // CraftBukkit start
|
|
+ protected void parseSelector(boolean overridePermissions) throws CommandSyntaxException {
|
|
+ this.usesSelectors = !overridePermissions;
|
|
+ // CraftBukkit end
|
|
this.suggestions = this::d;
|
|
if (!this.reader.canRead()) {
|
|
throw ArgumentParserSelector.ERROR_MISSING_SELECTOR_TYPE.createWithContext(this.reader);
|
|
@@ -465,6 +467,12 @@
|
|
}
|
|
|
|
public EntitySelector parse() throws CommandSyntaxException {
|
|
+ // CraftBukkit start
|
|
+ return parse(false);
|
|
+ }
|
|
+
|
|
+ public EntitySelector parse(boolean overridePermissions) throws CommandSyntaxException {
|
|
+ // CraftBukkit end
|
|
this.startPosition = this.reader.getCursor();
|
|
this.suggestions = this::b;
|
|
if (this.reader.canRead() && this.reader.peek() == '@') {
|
|
@@ -473,7 +481,7 @@
|
|
}
|
|
|
|
this.reader.skip();
|
|
- this.parseSelector();
|
|
+ this.parseSelector(overridePermissions); // CraftBukkit
|
|
} else {
|
|
this.c();
|
|
}
|