From 87110a913cd31898b36893ca454c8f95afd9e1c6 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sun, 11 Jun 2023 16:51:37 +0800
Subject: [PATCH] Simplify owner trait slightly

---
 .../citizensnpcs/api/trait/trait/Owner.java   | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/api/trait/trait/Owner.java b/src/main/java/net/citizensnpcs/api/trait/trait/Owner.java
index d3f0c39d..536afd42 100644
--- a/src/main/java/net/citizensnpcs/api/trait/trait/Owner.java
+++ b/src/main/java/net/citizensnpcs/api/trait/trait/Owner.java
@@ -6,17 +6,17 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 
-import net.citizensnpcs.api.exception.NPCLoadException;
+import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitName;
-import net.citizensnpcs.api.util.DataKey;
 
 /**
  * Represents the owner of an NPC.
  */
 @TraitName("owner")
 public class Owner extends Trait {
-    private UUID uuid = null;
+    @Persist
+    private UUID uuid;
 
     public Owner() {
         super("owner");
@@ -66,21 +66,6 @@ public boolean isOwnedBy(UUID other) {
         return uuid == null ? other == null : uuid.equals(other);
     }
 
-    @Override
-    public void load(DataKey key) throws NPCLoadException {
-        if (key.keyExists("uuid") && !key.getString("uuid").isEmpty()) {
-            uuid = UUID.fromString(key.getString("uuid"));
-        } else {
-            uuid = null;
-        }
-        key.removeKey("owner");
-    }
-
-    @Override
-    public void save(DataKey key) {
-        key.setString("uuid", uuid == null ? "" : uuid.toString());
-    }
-
     public void setOwner(CommandSender sender) {
         if (sender instanceof OfflinePlayer) {
             this.uuid = ((OfflinePlayer) sender).getUniqueId();