diff --git a/pom.xml b/pom.xml
index 9142f17..20d3def 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
cn.lunadeer
Dominion
- 1.30.10-beta
+ 1.30.11-beta
jar
Dominion
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 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);
}