Remove SkipQueue annotation, and combine with perm condition

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

View File

@ -21,7 +21,6 @@ package com.sk89q.worldedit.internal.command;
import com.google.common.collect.ImmutableList;
import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
import com.sk89q.worldedit.command.util.CommandQueuedConditionGenerator;
import org.enginehub.piston.CommandManager;
import org.enginehub.piston.gen.CommandCallListener;
import org.enginehub.piston.gen.CommandRegistration;
@ -31,7 +30,6 @@ import java.util.List;
public class CommandRegistrationHandler {
private static final CommandPermissionsConditionGenerator PERM_GEN = new CommandPermissionsConditionGenerator();
private static final CommandQueuedConditionGenerator QUEUED_GEN = new CommandQueuedConditionGenerator();
private final List<CommandCallListener> callListeners;
@ -49,11 +47,6 @@ public class CommandRegistrationHandler {
PERM_GEN
);
}
if (registration instanceof CommandQueuedConditionGenerator.Registration) {
((CommandQueuedConditionGenerator.Registration) registration).commandQueuedConditionGenerator(
QUEUED_GEN
);
}
registration.build();
}
}