--- a/net/minecraft/server/ArgumentParserSelector.java +++ b/net/minecraft/server/ArgumentParserSelector.java @@ -126,7 +126,7 @@ axisalignedbb = this.a(this.v == null ? 0.0D : this.v, this.w == null ? 0.0D : this.w, this.x == null ? 0.0D : this.x); } - Function function; + Function function; // CraftBukkit - decompile error if (this.s == null && this.t == null && this.u == null) { function = (vec3d) -> { @@ -187,8 +187,10 @@ }; } - protected void b() throws CommandSyntaxException { - this.T = true; + // CraftBukkit start + protected void b(boolean overridePermissions) throws CommandSyntaxException { + this.T = !overridePermissions; + // CraftBukkit end this.G = this::d; if (!this.l.canRead()) { throw ArgumentParserSelector.d.createWithContext(this.l); @@ -431,6 +433,12 @@ } public EntitySelector s() throws CommandSyntaxException { + // CraftBukkit start + return s(false); + } + + public EntitySelector s(boolean overridePermissions) throws CommandSyntaxException { + // CraftBukkit end this.E = this.l.getCursor(); this.G = this::b; if (this.l.canRead() && this.l.peek() == '@') { @@ -439,7 +447,7 @@ } this.l.skip(); - this.b(); + this.b(overridePermissions); // CraftBukkit } else { this.c(); }