diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index c2da7e445..bfbbf26d5 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Download BuildTools
       run: wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
     - name: Run BuildTools
-      run: java -jar BuildTools.jar --rev latest
+      run: java -jar BuildTools.jar --rev 1.16.2
     - name: Test with Gradle
-      run: ./gradlew clean build -x test
+      run: ./gradlew clean build sourcesJar javadocJar
       
diff --git a/README.md b/README.md
index 8c90a3c07..6bb89b65d 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ You can safely ignore `gradlew setupDecompWorkspace` if you are not planning to
 
 ```
 $ gradlew setupDecompWorkspace
-$ gradlew clean build -x test
+$ gradlew build
 ```
 
 The jar is located in `worldedit-bukkit/build/libs/FastAsyncWorldEdit-1.16-###.jar`
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/AbstractDirectionConverter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/AbstractDirectionConverter.java
index 1765d94e6..4ecbe2879 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/AbstractDirectionConverter.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/AbstractDirectionConverter.java
@@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableSet;
 import com.sk89q.worldedit.UnknownDirectionException;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.internal.annotation.Direction;
 import com.sk89q.worldedit.internal.annotation.MultiDirection;
 import com.sk89q.worldedit.internal.annotation.OptionalArg;
@@ -93,8 +94,7 @@ public abstract class AbstractDirectionConverter<D> implements ArgumentConverter
 
     @Override
     public ConversionResult<D> convert(String argument, InjectedValueAccess context) {
-        Player player = context.injectedValue(Key.of(Player.class, OptionalArg.class))
-            .orElse(null);
+        Player player = context.injectedValue(Key.of(Actor.class)).filter(Player.class::isInstance).map(Player.class::cast).orElse(null);
         try {
             return SuccessfulConversion.fromSingle(convertDirection(argument, player, includeDiagonals));
         } catch (Exception e) {