Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-02 22:47:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix ArgumentBlockState not throwing an exception when properties are incorrect

Browse Source
This commit is contained in:
TheMode 2021-08-22 07:13:50 +02:00
parent 746cf19869
commit 2dbf795d5c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentBlockState.java
View File

@ -13,6 +13,7 @@ public class ArgumentBlockState extends Argument<Block> {
public static final int NO_BLOCK = 1; public static final int NO_BLOCK = 1;
public static final int INVALID_BLOCK = 2; public static final int INVALID_BLOCK = 2;
public static final int INVALID_PROPERTY = 3; public static final int INVALID_PROPERTY = 3;
public static final int INVALID_PROPERTY_VALUE = 4;
public ArgumentBlockState(@NotNull String id) { public ArgumentBlockState(@NotNull String id) {
super(id, true, false); super(id, true, false);
@ -58,7 +59,11 @@ public class ArgumentBlockState extends Argument<Block> {
// Compute properties // Compute properties
final String query = input.substring(nbtIndex); final String query = input.substring(nbtIndex);
final var propertyMap = BlockUtils.parseProperties(query); final var propertyMap = BlockUtils.parseProperties(query);
return block.withProperties(propertyMap); try {
return block.withProperties(propertyMap);
} catch (IllegalArgumentException e) {
throw new ArgumentSyntaxException("Invalid property values", input, INVALID_PROPERTY_VALUE);
}
} }
} }