This commit is contained in:
kento2 2026-07-05 03:06:21 +02:00
parent b234cd9df7
commit 76f4ba2ec9
5 changed files with 15 additions and 52 deletions

View file

@ -12,7 +12,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@RequiredArgsConstructor
public class CommandHandler<T> {
@ -34,7 +33,7 @@ public class CommandHandler<T> {
if (ex != null)
sendMessageMethod.send(sender, rootNode.getMessageStyle().exception(ex));
result.ifFailure(failure ->
sendMessageMethod.send(sender, rootNode.getMessageStyle().err(failure)));
sendMessageMethod.send(sender, rootNode.getMessageStyle().err(failure)));
});
}

View file

@ -27,7 +27,7 @@ public class CommandParser<T> {
while (argStrIter.hasNext()) {
for (var nodeArg : cur.getArguments()) {
var parsed = parseArgument(rootNode, nodeArg, argStrIter, sender, !parseArgs);
var parsed = parseArgument(rootNode, nodeArg, argStrIter, sender, parseArgs);
if (parsed.hasFailure())
return parsed.getFailure().orElseThrow();
if (parseArgs)
@ -60,13 +60,13 @@ public class CommandParser<T> {
CommandArgument<T, ?> nodeArg,
Iterator<String> args,
T sender,
boolean fakeParse
boolean parseArgs
) {
Object value;
if (args.hasNext()) {
var argStr = getRawArgument(args, nodeArg);
if (fakeParse) {
if (!parseArgs) {
value = null;
} else {
try {