Don't load UUID if there's no UUID to load

CitizensDev · Jan 12, 2014 · af6f05b · af6f05b
1 parent 77e3a4f
commit af6f05b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
@@ -284,7 +284,9 @@ public boolean isSpawned() {
     @Override
     public void load(final DataKey root) {
         metadata.loadFrom(root.getRelative("metadata"));
-        uuid = UUID.fromString(root.getString("uuid"));
+        if (root.keyExists("uuid")) {
+            uuid = UUID.fromString(root.getString("uuid"));
+        }
 
         String traitNames = root.getString("traitnames");
         Set<DataKey> keys = Sets.newHashSet(root.getRelative("traits").getSubKeys());