Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #1326 by adding the condition at the beginning of the syntax

This commit is contained in:
Noel Németh 2022-08-16 11:31:33 +02:00
parent d84c41883c
commit 8b74a7f1b8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minestom/server/command/GraphImpl.java
View File

@ -108,6 +108,7 @@ record GraphImpl(NodeImpl root) implements Graph {
static ExecutionImpl fromSyntax(CommandSyntax syntax) {
final CommandExecutor executor = syntax.getExecutor();
final CommandCondition condition = syntax.getCommandCondition();
//TODO Check if condition can be removed here since it's already added at the beginning of the syntax
return new ExecutionImpl(commandSender -> condition == null || condition.canUse(commandSender, null),
null, null, executor, condition);
}
@ -131,10 +132,16 @@ record GraphImpl(NodeImpl root) implements Graph {
// Syntaxes
for (CommandSyntax syntax : command.getSyntaxes()) {
ConversionNode syntaxNode = root;
final CommandCondition condition = syntax.getCommandCondition();
//TODO Index based loop to make the first/last checks nicer
for (Argument<?> arg : syntax.getArguments()) {
boolean first = arg == syntax.getArguments()[0];
boolean last = arg == syntax.getArguments()[syntax.getArguments().length - 1];
syntaxNode = syntaxNode.nextMap.computeIfAbsent(arg, argument -> {
var ex = last ? ExecutionImpl.fromSyntax(syntax) : null;
var ex = first && condition != null ?
new ExecutionImpl(commandSender -> condition.canUse(commandSender, null),
null, null, null, condition) : null;
ex = last ? ExecutionImpl.fromSyntax(syntax) : ex;
return new ConversionNode(argument, ex);
});
}