Bump to 0.5.29: use true command executor for permission check

build.gradle

@@ -21,7 +21,7 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply plugin: 'org.spongepowered.mixin'
 
-version = '0.5.28'
+version = '0.5.29'
 group = 'org.teacon'
 archivesBaseName = 'AreaControl-Forge-1.18'
 

src/main/java/org/teacon/areacontrol/AreaControlCommand.java

@@ -36,6 +36,7 @@
 import org.teacon.areacontrol.api.AreaProperties;
 import org.teacon.areacontrol.impl.AreaPropertyArgument;
 import org.teacon.areacontrol.impl.DirectionArgument;
+import org.teacon.areacontrol.mixin.CommandSourceStackAccessor;
 
 import java.util.Objects;
 import java.util.UUID;
@@ -117,10 +118,11 @@ public AreaControlCommand(CommandDispatcher<CommandSourceStack> dispatcher) {
 
     private static Predicate<CommandSourceStack> check(PermissionNode<Boolean> permission) {
         return source -> {
-            if (source.getEntity() instanceof ServerPlayer) {
-                return PermissionAPI.getPermission((ServerPlayer) source.getEntity(), permission);
+            // /execute as will change the "on-behalf-of" source, so we need to extract the true source.
+            if (((CommandSourceStackAccessor) source).getSource() instanceof ServerPlayer sp) {
+                return PermissionAPI.getPermission(sp, permission);
             }
-            return source.hasPermission(2);
+            return false;
         };
     }
 

src/main/java/org/teacon/areacontrol/mixin/CommandSourceStackAccessor.java

@@ -0,0 +1,13 @@
+package org.teacon.areacontrol.mixin;
+
+import net.minecraft.commands.CommandSource;
+import net.minecraft.commands.CommandSourceStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(CommandSourceStack.class)
+public interface CommandSourceStackAccessor {
+
+    @Accessor
+    CommandSource getSource();
+}

src/main/resources/area_control.mixins.json

@@ -7,7 +7,8 @@
   "mixins": [
     "EntityMixin",
     "FireMixin",
-    "LavaMixin"
+    "LavaMixin",
+    "CommandSourceStackAccessor"
   ],
   "injectors": {
     "defaultRequire": 1