Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-03-02 11:21:15 +01:00
Code Issues Projects Releases Wiki Activity

Prevent runtime exception when passing an array with null values in ArgumentWord

Browse Source
This commit is contained in:
themode 2021-01-19 06:27:58 +01:00
parent 7d72d48a5a
commit 240a745830
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minestom/server/command/builder/arguments/ArgumentWord.java
View File

@ -1,6 +1,7 @@
package net.minestom.server.command.builder.arguments; package net.minestom.server.command.builder.arguments;
import net.minestom.server.command.builder.exception.ArgumentSyntaxException; import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
import net.minestom.server.utils.validate.Check;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -30,11 +31,21 @@ public class ArgumentWord extends Argument<String> {
* <p> * <p>
* WARNING: having an array too long would result in a packet too big or the client being stuck during login. * WARNING: having an array too long would result in a packet too big or the client being stuck during login.
* *
* @param restrictions the accepted words * @param restrictions the accepted words,
* can be null but if an array is passed
* you need to ensure that it is filled with non-null values
* @return 'this' for chaining * @return 'this' for chaining
* @throws NullPointerException if {@code restrictions} is not null but contains null value(s)
*/ */
@NotNull @NotNull
public ArgumentWord from(@Nullable String... restrictions) { public ArgumentWord from(@Nullable String... restrictions) {
if (restrictions != null) {
for (String restriction : restrictions) {
Check.notNull(restriction,
"ArgumentWord restriction cannot be null, you can pass 'null' instead of an empty array");
}
}
this.restrictions = restrictions; this.restrictions = restrictions;
return this; return this;
} }