From 033b103d35b2544ffec338aa89ad10ce46214f66 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Wed, 29 May 2024 23:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=A2=86=E5=9C=B0=E7=9A=84=E6=97=B6=E5=80=99=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?null=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                              | 2 +-
 src/main/java/cn/lunadeer/dominion/Cache.java        | 4 +---
 src/main/java/cn/lunadeer/dominion/DominionNode.java | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index f32c023..8cd66cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>Dominion</artifactId>
-    <version>1.30.4-beta</version>
+    <version>1.30.5-beta</version>
     <packaging>jar</packaging>
 
     <name>Dominion</name>
diff --git a/src/main/java/cn/lunadeer/dominion/Cache.java b/src/main/java/cn/lunadeer/dominion/Cache.java
index dad0b4e..7f1abe2 100644
--- a/src/main/java/cn/lunadeer/dominion/Cache.java
+++ b/src/main/java/cn/lunadeer/dominion/Cache.java
@@ -218,9 +218,7 @@ public class Cache {
     }
 
     public DominionDTO getDominion(Location loc) {
-        List<DominionNode> tree = world_dominion_tree.get(loc.getWorld().getName());
-        if (tree == null) return null;
-        return getLocInDominionDTO(tree, loc);
+        return getLocInDominionDTO(world_dominion_tree.get(loc.getWorld().getName()), loc);
     }
 
     public List<DominionNode> getDominionTreeByPlayer(String player_name) {
diff --git a/src/main/java/cn/lunadeer/dominion/DominionNode.java b/src/main/java/cn/lunadeer/dominion/DominionNode.java
index 162d903..1ec848f 100644
--- a/src/main/java/cn/lunadeer/dominion/DominionNode.java
+++ b/src/main/java/cn/lunadeer/dominion/DominionNode.java
@@ -44,7 +44,9 @@ public class DominionNode {
         return null;
     }
 
-    public static DominionDTO getLocInDominionDTO(@NotNull List<DominionNode> nodes, @NotNull Location loc) {
+    public static DominionDTO getLocInDominionDTO(@Nullable List<DominionNode> nodes, @NotNull Location loc) {
+        if (nodes == null) return null;
+        if (nodes.isEmpty()) return null;
         DominionNode dominionNode = getLocInDominionNode(nodes, loc);
         return dominionNode == null ? null : dominionNode.dominion;
     }