--- a/net/minecraft/commands/arguments/selector/ArgumentParserSelector.java +++ b/net/minecraft/commands/arguments/selector/ArgumentParserSelector.java @@ -147,7 +147,7 @@ axisalignedbb = this.createAabb(this.deltaX == null ? 0.0D : this.deltaX, this.deltaY == null ? 0.0D : this.deltaY, this.deltaZ == null ? 0.0D : this.deltaZ); } - Function function; + Function function; // CraftBukkit - decompile error if (this.x == null && this.y == null && this.z == null) { function = (vec3d) -> { @@ -204,8 +204,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::suggestSelector; if (!this.reader.canRead()) { throw ArgumentParserSelector.ERROR_MISSING_SELECTOR_TYPE.createWithContext(this.reader); @@ -494,6 +496,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::suggestNameOrSelector; if (this.reader.canRead() && this.reader.peek() == '@') { @@ -502,7 +510,7 @@ } this.reader.skip(); - this.parseSelector(); + this.parseSelector(overridePermissions); // CraftBukkit } else { this.parseNameOrUUID(); }