Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-12 10:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove SkipQueue annotation, and combine with perm condition

Browse Source 
it seems piston only generates one condition, idk why
This commit is contained in:
Jesse Boyd
2020-01-05 17:35:19 +11:00
parent 27ec3cdc66
commit 39b698f67d
10 changed files with 25 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
View File

@ -40,12 +40,10 @@ import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.command.util.CommandPermissions;
import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
import com.sk89q.worldedit.command.util.CommandQueuedConditionGenerator;
import com.sk89q.worldedit.command.util.CreatureButcher;
import com.sk89q.worldedit.command.util.EntityRemover;
import com.sk89q.worldedit.command.util.Logging;
import com.sk89q.worldedit.command.util.PrintCommandHelp;
import com.sk89q.worldedit.command.util.annotation.SkipQueue;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor;
@ -104,7 +102,7 @@ import org.jetbrains.annotations.Range;
/**
* Utility commands.
*/
@CommandContainer(superTypes = {CommandPermissionsConditionGenerator.Registration.class, CommandQueuedConditionGenerator.Registration.class})
@CommandContainer(superTypes = {CommandPermissionsConditionGenerator.Registration.class})
public class UtilityCommands {
private final WorldEdit we;
@ -185,8 +183,7 @@ public class UtilityCommands {
aliases= {"fcancel"},
desc = "Cancel your current command"
)
@CommandPermissions("fawe.cancel")
@SkipQueue
@CommandPermissions(value = "fawe.cancel", queued = false)
public void cancel(Player player) {
int cancelled = player.cancel(false);
player.print(Caption.of("fawe.cancel.worldedit.cancel.count" , cancelled));
@ -704,8 +701,7 @@ public class UtilityCommands {
name = "/confirm",
desc = "Confirm a command"
)
@SkipQueue
@CommandPermissions("fawe.confirm")
@CommandPermissions(value = "fawe.confirm", queued = false)
public void confirm(Player fp) throws WorldEditException {
if (!fp.confirm()) {
fp.print(TranslatableComponent.of("fawe.worldedit.utility.nothing.confirmed"));