Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-02 23:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into mask-work

Browse Source
This commit is contained in:
IronApollo 2020-09-07 21:45:05 -04:00
commit 7929320611
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/gradle.yml vendored
View File

@ -47,7 +47,7 @@ jobs:
- name: Download BuildTools - name: Download BuildTools
run: wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar run: wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
- name: Run BuildTools - name: Run BuildTools
run: java -jar BuildTools.jar --rev latest run: java -jar BuildTools.jar --rev 1.16.2
- name: Test with Gradle - name: Test with Gradle
run: ./gradlew clean build -x test run: ./gradlew clean build sourcesJar javadocJar

2
README.md
View File

@ -27,7 +27,7 @@ You can safely ignore `gradlew setupDecompWorkspace` if you are not planning to
``` ```
$ gradlew setupDecompWorkspace $ gradlew setupDecompWorkspace
$ gradlew clean build -x test $ gradlew build
``` ```
The jar is located in `worldedit-bukkit/build/libs/FastAsyncWorldEdit-1.16-###.jar` The jar is located in `worldedit-bukkit/build/libs/FastAsyncWorldEdit-1.16-###.jar`

4
worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/AbstractDirectionConverter.java
View File

@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableSet;
import com.sk89q.worldedit.UnknownDirectionException; import com.sk89q.worldedit.UnknownDirectionException;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.entity.Player; 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.Direction;
import com.sk89q.worldedit.internal.annotation.MultiDirection; import com.sk89q.worldedit.internal.annotation.MultiDirection;
import com.sk89q.worldedit.internal.annotation.OptionalArg; import com.sk89q.worldedit.internal.annotation.OptionalArg;
@ -93,8 +94,7 @@ public abstract class AbstractDirectionConverter<D> implements ArgumentConverter
@Override @Override
public ConversionResult<D> convert(String argument, InjectedValueAccess context) { public ConversionResult<D> convert(String argument, InjectedValueAccess context) {
Player player = context.injectedValue(Key.of(Player.class, OptionalArg.class)) Player player = context.injectedValue(Key.of(Actor.class)).filter(Player.class::isInstance).map(Player.class::cast).orElse(null);
.orElse(null);
try { try {
return SuccessfulConversion.fromSingle(convertDirection(argument, player, includeDiagonals)); return SuccessfulConversion.fromSingle(convertDirection(argument, player, includeDiagonals));
} catch (Exception e) { } catch (Exception e) {