zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

brigadier: Unwrap mapped argument parsers

Browse source
This commit is contained in:
Zach Levis 2021-01-09 22:24:26 -08:00 • committed by Jason
parent 52c0796539
commit 6eae149089
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java
View file

@ -31,6 +31,7 @@ import cloud.commandframework.arguments.StaticArgument;
import cloud.commandframework.arguments.compound.CompoundArgument; import cloud.commandframework.arguments.compound.CompoundArgument;
import cloud.commandframework.arguments.compound.FlagArgument; import cloud.commandframework.arguments.compound.FlagArgument;
import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.arguments.parser.ArgumentParser;
import cloud.commandframework.arguments.parser.MappedArgumentParser;
import cloud.commandframework.arguments.standard.BooleanArgument; import cloud.commandframework.arguments.standard.BooleanArgument;
import cloud.commandframework.arguments.standard.ByteArgument; import cloud.commandframework.arguments.standard.ByteArgument;
import cloud.commandframework.arguments.standard.DoubleArgument; import cloud.commandframework.arguments.standard.DoubleArgument;
@ -387,7 +388,12 @@ public final class CloudBrigadierManager<C, S> {
final @NonNull TypeToken<T> argumentType, final @NonNull TypeToken<T> argumentType,
final @NonNull K argument final @NonNull K argument
) { ) {
final ArgumentParser<C, ?> commandArgument = (ArgumentParser<C, ?>) argument; /* Unwrap mapped arguments */
ArgumentParser<C, ?> commandArgument = (ArgumentParser<C, ?>) argument;
while (commandArgument instanceof MappedArgumentParser<?, ?, ?>) {
commandArgument = ((MappedArgumentParser<C, ?, ?>) commandArgument).getBaseParser();
}
final BrigadierMapping<C, K, S> mapping = (BrigadierMapping<C, K, S>) this.mappers final BrigadierMapping<C, K, S> mapping = (BrigadierMapping<C, K, S>) this.mappers
.get(GenericTypeReflector.erase(argumentType.getType())); .get(GenericTypeReflector.erase(argumentType.getType()));
if (mapping == null || mapping.getMapper() == null) { if (mapping == null || mapping.getMapper() == null) {