fix BukkitBrigadier#getArgumentType

Grabsky · Grabsky · commit 906ad8c8890f · 2022-06-08T23:17:43.000+02:00
diff --git 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();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,12 @@ public CommodoreBukkitBrigadier(BukkitCommandHandler handler) {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public @NotNull ArgumentType<?> getArgumentType(@NotNull CommandParameter parameter) {`
`84`		`- ArgumentType<?> type = argumentTypes.getFlexible(parameter.getType()).getArgumentType(parameter);`
`85`		`- if (type != null)`
`86`		`- return type;`
	`84`	`+ ArgumentTypeResolver resolver = argumentTypes.getFlexible(parameter.getType());`
	`85`	`+ if (resolver != null) {`
	`86`	`+ ArgumentType<?> type = resolver.getArgumentType(parameter);`
	`87`	`+ if (type != null)`
	`88`	`+ return type;`
	`89`	`+ }`
`87`	`90`	`return StringArgumentType.string();`
`88`	`91`	`}`
`89`	`92`