fix(blocks): Fix block state not accepting id directly

Fixes #114
Valandur · Aug 13, 2018 · da6a148 · da6a148
1 parent 539c9ce
commit da6a148
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/valandur/webapi/serialize/deserialize/BlockStateDeserializer.java b/src/main/java/valandur/webapi/serialize/deserialize/BlockStateDeserializer.java
@@ -25,11 +25,13 @@ public BlockStateDeserializer() {
     @Override
     public BlockState deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
         JsonNode root = p.readValueAsTree();
-        if (root.path("type").path("id").isMissingNode()) {
-            return null;
+        if (root.path("type").isMissingNode()) {
+            throw new IOException("Missing block type");
         }
 
-        String typeStr = root.path("type").path("id").asText();
+        String typeStr = root.path("type").isTextual()
+                ? root.path("type").asText()
+                : root.path("type").path("id").asText();
         Optional<BlockType> optType = Sponge.getRegistry().getType(BlockType.class, typeStr);
         if (!optType.isPresent()) {
             throw new IOException("Invalid block type " + typeStr);