From 4af0ba761dcdff33d3d3b889ece0eb6d1996289f Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Mon, 26 Feb 2024 20:22:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E6=94=BE=E7=BD=AE=E6=A3=80=E6=B5=8B=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 2 +-
 .../lunadeer/dominion/controllers/DominionController.java   | 6 ++++--
 src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index c0f9610..f631586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>Dominion</artifactId>
-    <version>1.11.2-beta</version>
+    <version>1.11.3-beta</version>
     <packaging>jar</packaging>
 
     <name>Dominion</name>
diff --git a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java
index cd97a4e..fee79f5 100644
--- a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java
+++ b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java
@@ -98,8 +98,10 @@ public class DominionController {
             return null;
         }
         // 是否是父领地的拥有者
-        if (notOwner(owner, parent_dominion) && parent_dominion.getId() != -1) {
-            return null;
+        if (parent_dominion.getId() != -1) {
+            if (notOwner(owner, parent_dominion)) {
+                return null;
+            }
         }
         // 如果parent_dominion不为-1 检查是否在同一世界
         if (parent_dominion.getId() != -1 && !parent_dominion.getWorld().equals(dominion.getWorld())) {
diff --git a/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java b/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
index 84d084f..f35170d 100644
--- a/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
+++ b/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
@@ -887,7 +887,7 @@ public class PlayerEvents implements Listener {
     public static boolean onPlace(Player player) {
         DominionDTO dom = Cache.instance.getPlayerCurrentDominion(player);
         if (dom == null) {
-            return false;
+            return true;
         }
         if (Apis.hasPermission(player, dom)) {
             return true;