From 4213d14fd6c599311b4e874fcec036805c908758 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Mon, 8 Jul 2024 01:19:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=A1=E6=9C=89=E4=BC=A0?=
 =?UTF-8?q?=E9=80=81=E7=82=B9=E6=97=B6=E7=9A=84=E8=AD=A6=E5=91=8A=E4=B8=BA?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lunadeer/dominion/controllers/DominionController.java  | 1 -
 .../java/cn/lunadeer/dominion/managers/GlobalTeleport.java    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java
index 63d33f9..5e137cc 100644
--- a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java
+++ b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java
@@ -167,7 +167,6 @@ public class DominionController {
         }
         // 显示粒子效果
         handleParticle(operator, dominion.getWorld(), dominion.getX1(), dominion.getY1(), dominion.getZ1(), dominion.getX2(), dominion.getY2(), dominion.getZ2(), FAIL);
-        dominion.setParentDomId(parent_dominion.getId());
         operator.setResponse(SUCCESS);
     }
 
diff --git a/src/main/java/cn/lunadeer/dominion/managers/GlobalTeleport.java b/src/main/java/cn/lunadeer/dominion/managers/GlobalTeleport.java
index db3dfd3..735d9a2 100644
--- a/src/main/java/cn/lunadeer/dominion/managers/GlobalTeleport.java
+++ b/src/main/java/cn/lunadeer/dominion/managers/GlobalTeleport.java
@@ -140,10 +140,10 @@ public class GlobalTeleport implements PluginMessageListener, Listener {
         World world = Dominion.instance.getServer().getWorld(dominionDTO.getWorld());
         if (location == null) {
             location = new Location(world, center_x, player.getLocation().getY(), center_z);
-            XLogger.warn("领地 %s 没有设置传送点，将尝试传送到中心点", dominionDTO.getName());
+            Notification.warn(player, "领地 %s 没有设置传送点，将尝试传送到中心点", dominionDTO.getName());
         } else if (!isInDominion(dominionDTO, location)) {
             location = new Location(world, center_x, player.getLocation().getY(), center_z);
-            XLogger.warn("领地 %s 传送点不在领地内，将尝试传送到中心点", dominionDTO.getName());
+            Notification.warn(player, "领地 %s 传送点不在领地内，将尝试传送到中心点", dominionDTO.getName());
         }
         if (player.isOnline()) {
             Teleport.doTeleportSafely(player, location).thenAccept(b -> {