mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
28 lines
1.8 KiB
Diff
28 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
|
Date: Wed, 26 Oct 2022 13:13:12 -0700
|
|
Subject: [PATCH] Fix EntityArgument suggestion permissions to align with
|
|
EntitySelector#checkPermissions
|
|
|
|
Fixes where the user has permission for selectors but not their
|
|
suggestions, which especially matters when we force suggestions to
|
|
the server for this type
|
|
|
|
diff --git a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
|
|
index 78eca3243a276260ff26c3587fb60e17e0439af0..2043001c16b3530c2d3f52efda10bcad424881c0 100644
|
|
--- a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
|
|
+++ b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
|
|
@@ -127,7 +127,12 @@ public class EntityArgument implements ArgumentType<EntitySelector> {
|
|
StringReader stringreader = new StringReader(suggestionsbuilder.getInput());
|
|
|
|
stringreader.setCursor(suggestionsbuilder.getStart());
|
|
- EntitySelectorParser argumentparserselector = new EntitySelectorParser(stringreader, icompletionprovider.hasPermission(2));
|
|
+ // Paper start - Fix EntityArgument suggestion permissions
|
|
+ final boolean permission = object instanceof CommandSourceStack stack
|
|
+ ? stack.bypassSelectorPermissions || stack.hasPermission(2, "minecraft.command.selector")
|
|
+ : icompletionprovider.hasPermission(2);
|
|
+ EntitySelectorParser argumentparserselector = new EntitySelectorParser(stringreader, permission);
|
|
+ // Paper end - Fix EntityArgument suggestion permissions
|
|
|
|
try {
|
|
argumentparserselector.parse();
|