twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-09-01 12:53:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Repackage patches

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-03-16 09:00:00 +11:00
parent 2777f7b780
commit 18496e998f
433 changed files with 0 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
paper-server/nms-patches/net/minecraft/commands/arguments/selector/ArgumentParserSelector.patch Normal file
View File

@@ -0,0 +1,46 @@
--- a/net/minecraft/server/ArgumentParserSelector.java
+++ b/net/minecraft/server/ArgumentParserSelector.java
@@ -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) -> {
@@ -188,8 +188,10 @@
};
}
- protected void parseSelector() throws CommandSyntaxException {
- this.checkPermissions = true;
+ // CraftBukkit start
+ 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);
@@ -443,6 +445,12 @@
}
public EntitySelector parse() throws CommandSyntaxException {
+ // CraftBukkit start
+ return parse(false);
+ }
+
+ 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() == '@') {
@@ -451,7 +459,7 @@
}
this.l.skip();
- this.parseSelector();
+ this.parseSelector(overridePermissions); // CraftBukkit
} else {
this.c();
}

11
paper-server/nms-patches/net/minecraft/commands/arguments/selector/EntitySelector.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/net/minecraft/server/EntitySelector.java
+++ b/net/minecraft/server/EntitySelector.java
@@ -64,7 +64,7 @@
}
private void e(CommandListenerWrapper commandlistenerwrapper) throws CommandSyntaxException {
- if (this.checkPermissions && !commandlistenerwrapper.hasPermission(2)) {
+ if (this.checkPermissions && !commandlistenerwrapper.hasPermission(2, "minecraft.command.selector")) { // CraftBukkit
throw ArgumentEntity.f.create();
}
}