From c30e5d9d66fbea547e27ee479a63c9237e7d60f7 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Sat, 1 Jun 2024 09:59:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=9C=B0=E6=8F=90=E7=A4=BA=E8=AF=AD?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=E5=8D=A0=E4=BD=8D=E7=AC=A6?=
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            | 8 ++++++--
 src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java | 9 ++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9142f17..20d3def 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>Dominion</artifactId>
-    <version>1.30.10-beta</version>
+    <version>1.30.11-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 a262575..f1f31e1 100644
--- a/src/main/java/cn/lunadeer/dominion/Cache.java
+++ b/src/main/java/cn/lunadeer/dominion/Cache.java
@@ -141,14 +141,18 @@ public class Cache {
 //                Notification.info(player, "您已离开领地：%s", last_dominion.getName());
 //             else
 //                Notification.info(player, "您已离开子领地：%s", last_dominion.getName());
-            player.sendActionBar(Component.text(last_dominion.getLeaveMessage()));
+            String msg = last_dominion.getLeaveMessage();
+            msg = msg.replace("${DOM_NAME}", last_dominion.getName());
+            player.sendActionBar(Component.text(msg));
         }
         if (current_dom_id != -1) {
 //            if (current_dominion.getParentDomId() == -1)
 //                Notification.info(player, "您正在进入领地：%s", current_dominion.getName());
 //            else
 //                Notification.info(player, "您正在进入子领地：%s", current_dominion.getName());
-            player.sendActionBar(Component.text(current_dominion.getJoinMessage()));
+            String msg = current_dominion.getJoinMessage();
+            msg = msg.replace("${DOM_NAME}", current_dominion.getName());
+            player.sendActionBar(Component.text(msg));
         }
 
         lightOrNot(player, current_dominion);   // 发光检查
diff --git a/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java b/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java
index 5e04932..882ee47 100644
--- a/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java
+++ b/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java
@@ -111,12 +111,12 @@ public class DominionDTO {
         for (Flag f : Flag.getAllDominionFlags()) {
             sql += f.getFlagName() + ", ";
         }
-        sql += "tp_location";
+        sql += "tp_location, join_message, leave_message";
         sql += ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ";
         for (Flag f : Flag.getAllDominionFlags()) {
             sql += f.getDefaultValue() + ", ";
         }
-        sql += "'default'";
+        sql += "'default', ?, ?)";
         sql += ") RETURNING *;";
         List<DominionDTO> dominions = query(sql,
                 dominion.getOwner(),
@@ -127,7 +127,10 @@ public class DominionDTO {
                 dominion.getZ1(),
                 dominion.getX2(),
                 dominion.getY2(),
-                dominion.getZ2());
+                dominion.getZ2(),
+                "欢迎来到 ${DOM_NAME}！",
+                "你正在离开 ${DOM_NAME}，欢迎下次光临～"
+                );
         if (dominions.size() == 0) return null;
         return dominions.get(0);
     }