From 906ad8c8890f6e14dcbf17dc20767230a5af89a3 Mon Sep 17 00:00:00 2001 From: Grabsky <44530932+Grabsky@users.noreply.github.com> Date: Wed, 8 Jun 2022 23:17:43 +0200 Subject: [PATCH] fix `BukkitBrigadier#getArgumentType` --- .../bukkit/brigadier/CommodoreBukkitBrigadier.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/CommodoreBukkitBrigadier.java b/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/CommodoreBukkitBrigadier.java index 0d7b0c06..f5ffc094 100644 --- a/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/CommodoreBukkitBrigadier.java +++ b/bukkit/src/main/java/revxrsal/commands/bukkit/brigadier/CommodoreBukkitBrigadier.java @@ -81,9 +81,12 @@ public CommodoreBukkitBrigadier(BukkitCommandHandler handler) { } public @NotNull ArgumentType getArgumentType(@NotNull CommandParameter parameter) { - ArgumentType type = argumentTypes.getFlexible(parameter.getType()).getArgumentType(parameter); - if (type != null) - return type; + ArgumentTypeResolver resolver = argumentTypes.getFlexible(parameter.getType()); + if (resolver != null) { + ArgumentType type = resolver.getArgumentType(parameter); + if (type != null) + return type; + } return StringArgumentType.string(); }