From 96c07e3067a356f3a1b8b06cb25af97d32510028 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Sun, 4 Aug 2024 22:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=89=E4=BA=9B=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=E7=8E=A9=E5=AE=B6=E6=97=A0=E6=B3=95=E4=BB=8E?=
 =?UTF-8?q?res=E8=BF=81=E7=A7=BB=E9=A2=86=E5=9C=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                                       |  2 +-
 .../java/cn/lunadeer/dominion/utils/ResMigration.java  | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1fc8b38..aa4c354 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "cn.lunadeer"
-version = "1.44.3-beta"
+version = "1.44.4-beta"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(21))
diff --git a/src/main/java/cn/lunadeer/dominion/utils/ResMigration.java b/src/main/java/cn/lunadeer/dominion/utils/ResMigration.java
index 96adcc4..e0aab35 100644
--- a/src/main/java/cn/lunadeer/dominion/utils/ResMigration.java
+++ b/src/main/java/cn/lunadeer/dominion/utils/ResMigration.java
@@ -1,14 +1,12 @@
 package cn.lunadeer.dominion.utils;
 
 import cn.lunadeer.dominion.Dominion;
-import cn.lunadeer.dominion.dtos.PlayerDTO;
 import cn.lunadeer.dominion.utils.Residence.Message;
 import cn.lunadeer.dominion.utils.Residence.Permission;
 import cn.lunadeer.dominion.utils.Residence.Residence;
 import cn.lunadeer.dominion.utils.Residence.SaveFile;
 import cn.lunadeer.minecraftpluginutils.XLogger;
 import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.yaml.snakeyaml.Yaml;
@@ -58,19 +56,13 @@ public class ResMigration {
     }
 
     private static ResidenceNode parseDominion(String name, World world, Residence res, SaveFile save) {
-        OfflinePlayer bukkitOwner = Dominion.instance.getServer().getOfflinePlayer(UUID.fromString(res.Permissions.OwnerUUID));
-        PlayerDTO owner = PlayerDTO.get(bukkitOwner);
-        if (owner == null) {
-            XLogger.warn("Owner not found: " + res.Permissions.OwnerUUID);
-            return null;
-        }
         String[] loc = res.Areas.values().toArray()[0].toString().split(":");
         if (loc.length != 6) {
             XLogger.warn("Invalid location: " + res.Areas.get("main"));
             return null;
         }
         ResidenceNode dominionNode = new ResidenceNode();
-        dominionNode.owner = owner.getUuid();
+        dominionNode.owner = UUID.fromString(res.Permissions.OwnerUUID);
         dominionNode.world = world;
         dominionNode.name = name;
         dominionNode.joinMessage = save.Messages.get(res.Messages).EnterMessage;