twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-03 13:42:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

net.minecraft.commands.arguments(.{blocks|item})

Browse Source
This commit is contained in:
Noah van der Aa
2024-12-14 20:30:29 +01:00
parent a890e322f1
commit f1ee7a0262
6 changed files with 59 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
paper-server/patches/sources/net/minecraft/commands/arguments/EntityArgument.java.patch Normal file
View File

@@ -0,0 +1,32 @@
--- a/net/minecraft/commands/arguments/EntityArgument.java
+++ b/net/minecraft/commands/arguments/EntityArgument.java
@@ -105,9 +_,14 @@
}
private EntitySelector parse(StringReader reader, boolean allowSelectors) throws CommandSyntaxException {
+ // CraftBukkit start
+ return this.parse(reader, allowSelectors, true);
+ }
+ private EntitySelector parse(StringReader reader, boolean allowSelectors, boolean overridePermissions) throws CommandSyntaxException {
+ // CraftBukkit end
int i = 0;
EntitySelectorParser entitySelectorParser = new EntitySelectorParser(reader, allowSelectors);
- EntitySelector entitySelector = entitySelectorParser.parse();
+ EntitySelector entitySelector = entitySelectorParser.parse(overridePermissions); // CraftBukkit
if (entitySelector.getMaxResults() > 1 && this.single) {
if (this.playersOnly) {
reader.setCursor(0);
@@ -129,7 +_,12 @@
if (context.getSource() instanceof SharedSuggestionProvider sharedSuggestionProvider) {
StringReader stringReader = new StringReader(builder.getInput());
stringReader.setCursor(builder.getStart());
- EntitySelectorParser entitySelectorParser = new EntitySelectorParser(stringReader, EntitySelectorParser.allowSelectors(sharedSuggestionProvider));
+ // Paper start - Fix EntityArgument permissions
+ final boolean permission = sharedSuggestionProvider instanceof CommandSourceStack stack
+ ? stack.bypassSelectorPermissions || stack.hasPermission(2, "minecraft.command.selector")
+ : sharedSuggestionProvider.hasPermission(2);
+ EntitySelectorParser entitySelectorParser = new EntitySelectorParser(stringReader, permission);
+ // Paper end - Fix EntityArgument permissions
try {
entitySelectorParser.parse();