Fix parsing for injected command types

This commit is contained in:
Jesse Boyd
2019-11-11 08:55:53 +00:00
parent 10a6619853
commit 9d6f2df908
7 changed files with 39 additions and 10 deletions

View File

@ -30,6 +30,7 @@ import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.NoMatchException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extension.platform.PlatformCommandManager;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.internal.expression.Expression;
@ -44,7 +45,7 @@ import java.util.stream.Stream;
public class DefaultPatternParser extends FaweParser<Pattern> {
public DefaultPatternParser(WorldEdit worldEdit) {
super(worldEdit);
super(worldEdit, "patterns");
}
@Override
@ -72,7 +73,7 @@ public class DefaultPatternParser extends FaweParser<Pattern> {
List<String> args = entry.getValue();
String cmdArgs = ((args.isEmpty()) ? "" : " " + StringMan.join(args, " "));
try {
pattern = parse(cmdArgs, actor);
pattern = parse(command + cmdArgs, context);
} catch (SuggestInputParseException rethrow) {
throw rethrow;
} catch (Throwable e) {