Fix NbtAdapterRegistry extract method

SyntaxPhoenix · Apr 14, 2021 · 88258b4 · 88258b4
1 parent 00270b2
commit 88258b4
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...iner/src/main/java/com/syntaxphoenix/syntaxapi/data/container/nbt/NbtAdapterRegistry.java b/...iner/src/main/java/com/syntaxphoenix/syntaxapi/data/container/nbt/NbtAdapterRegistry.java
@@ -5,11 +5,19 @@
 import com.syntaxphoenix.syntaxapi.data.DataAdapter;
 import com.syntaxphoenix.syntaxapi.data.DataAdapterRegistry;
 import com.syntaxphoenix.syntaxapi.nbt.NbtTag;
+import com.syntaxphoenix.syntaxapi.nbt.NbtType;
 
 public class NbtAdapterRegistry extends DataAdapterRegistry<NbtTag> {
 
     public Object extract(NbtTag base) {
-        return extract(base.getType().getOwningClass(), base);
+        if (base.getType() == NbtType.END) {
+            return null;
+        }
+        Object value = extract(base.getValue().getClass(), base);
+        if (value instanceof NbtTag) {
+            return extract((NbtTag) value);
+        }
+        return value;
     }
 
     @Override