From d7b137d1446377bfd1958f8a0e24f63819b81bfc Mon Sep 17 00:00:00 2001 From: sciwhiz12 Date: Fri, 26 Aug 2022 02:42:11 +0800 Subject: [PATCH] Fix entity selector permission check to check original source (#8995) Permission checks should be against the command source and not the target entity, as is done in vanilla. Fixes #8994 --- src/main/java/net/minecraftforge/common/ForgeHooks.java | 2 +- src/main/resources/META-INF/accesstransformer.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index ef85dc72cc..f88dae7fba 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -1498,7 +1498,7 @@ public class ForgeHooks public static boolean canUseEntitySelectors(SharedSuggestionProvider provider) { - if (provider instanceof CommandSourceStack source && source.getEntity() instanceof ServerPlayer player) + if (provider instanceof CommandSourceStack source && source.source instanceof ServerPlayer player) { return PermissionAPI.getPermission(player, ForgeMod.USE_SELECTORS_PERMISSION); } diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 2888e7c7cd..16b38d08bf 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -139,6 +139,7 @@ protected net.minecraft.client.resources.model.ModelBakery f_119243_ # resourceM protected net.minecraft.client.resources.model.ModelBakery m_119364_(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/block/model/BlockModel; # loadBlockModel public net.minecraft.client.resources.model.SimpleBakedModel$Builder (ZZZLnet/minecraft/client/renderer/block/model/ItemTransforms;Lnet/minecraft/client/renderer/block/model/ItemOverrides;)V # constructor public net.minecraft.client.sounds.SoundEngine f_120217_ # soundManager +public net.minecraft.commands.CommandSourceStack f_81288_ # source public net.minecraft.commands.arguments.selector.EntitySelectorParser m_121229_()V # finalizePredicates public net.minecraft.commands.arguments.selector.EntitySelectorParser m_121317_()V # parseOptions public net.minecraft.commands.arguments.selector.options.EntitySelectorOptions m_121453_(Ljava/lang/String;Lnet/minecraft/commands/arguments/selector/options/EntitySelectorOptions$Modifier;Ljava/util/function/Predicate;Lnet/minecraft/network/chat/Component;)V # register