3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-23 23:00:08 +01:00
Paper/nms-patches/ArgumentParserSelector.patch

47 Zeilen
1.6 KiB
Diff

--- a/net/minecraft/server/ArgumentParserSelector.java
+++ b/net/minecraft/server/ArgumentParserSelector.java
2019-04-23 04:00:00 +02:00
@@ -127,7 +127,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<Vec3D, Vec3D> function; // CraftBukkit - decompile error
if (this.s == null && this.t == null && this.u == null) {
function = (vec3d) -> {
2019-04-23 04:00:00 +02:00
@@ -188,8 +188,10 @@
};
}
2019-04-23 04:00:00 +02:00
- protected void parseSelector() throws CommandSyntaxException {
- this.checkPermissions = true;
+ // CraftBukkit start
2019-04-23 04:00:00 +02:00
+ protected void parseSelector(boolean overridePermissions) throws CommandSyntaxException {
+ this.checkPermissions = !overridePermissions;
+ // CraftBukkit end
this.G = this::d;
if (!this.l.canRead()) {
throw ArgumentParserSelector.d.createWithContext(this.l);
2019-04-23 04:00:00 +02:00
@@ -443,6 +445,12 @@
}
2019-04-23 04:00:00 +02:00
public EntitySelector parse() throws CommandSyntaxException {
+ // CraftBukkit start
2019-04-23 04:00:00 +02:00
+ return parse(false);
+ }
+
2019-04-23 04:00:00 +02:00
+ public EntitySelector parse(boolean overridePermissions) throws CommandSyntaxException {
+ // CraftBukkit end
this.E = this.l.getCursor();
this.G = this::b;
if (this.l.canRead() && this.l.peek() == '@') {
2019-04-23 04:00:00 +02:00
@@ -451,7 +459,7 @@
}
this.l.skip();
2019-04-23 04:00:00 +02:00
- this.parseSelector();
+ this.parseSelector(overridePermissions); // CraftBukkit
} else {
this.c();
}