diff --git a/pom.xml b/pom.xml
index df18227..651cdf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
cn.lunadeer
Dominion
- 1.31.6-beta
+ 1.32.0-beta
jar
Dominion
diff --git a/src/main/java/cn/lunadeer/dominion/Commands.java b/src/main/java/cn/lunadeer/dominion/Commands.java
index 8f9dca3..efeae3c 100644
--- a/src/main/java/cn/lunadeer/dominion/Commands.java
+++ b/src/main/java/cn/lunadeer/dominion/Commands.java
@@ -177,6 +177,9 @@ public class Commands implements TabExecutor {
case "set_map_color":
DominionOperate.setMapColor(sender, args);
break;
+ case "env_info":
+ DominionEnvInfo.show(sender, args);
+ break;
// ---=== CUI ===---
case "cui_rename":
RenameDominion.open(sender, args);
diff --git a/src/main/java/cn/lunadeer/dominion/commands/DominionFlag.java b/src/main/java/cn/lunadeer/dominion/commands/DominionFlag.java
index 1ef2719..bb53985 100644
--- a/src/main/java/cn/lunadeer/dominion/commands/DominionFlag.java
+++ b/src/main/java/cn/lunadeer/dominion/commands/DominionFlag.java
@@ -2,6 +2,8 @@ package cn.lunadeer.dominion.commands;
import cn.lunadeer.dominion.controllers.BukkitPlayerOperator;
import cn.lunadeer.dominion.controllers.FlagsController;
+import cn.lunadeer.dominion.dtos.Flag;
+import cn.lunadeer.dominion.tuis.DominionEnvInfo;
import cn.lunadeer.dominion.tuis.DominionFlagInfo;
import cn.lunadeer.minecraftpluginutils.Notification;
import org.bukkit.command.CommandSender;
@@ -29,10 +31,15 @@ public class DominionFlag {
} else if (args.length == 5) {
FlagsController.setFlag(operator, args[1], Boolean.parseBoolean(args[2]), args[3]);
String[] newArgs = new String[3];
- newArgs[0] = "flag_info";
+ newArgs[0] = Flag.isDominionOnlyFlag(args[1]) ? "env_info" : "flag_info";
newArgs[1] = args[3];
newArgs[2] = args[4];
- DominionFlagInfo.show(sender, newArgs);
+ if (Flag.isDominionOnlyFlag(args[1])) {
+ DominionEnvInfo.show(sender, newArgs);
+ } else {
+ DominionFlagInfo.show(sender, newArgs);
+ }
+
} else {
Notification.error(sender, "用法: /dominion set <权限名称> [领地名称]");
}
diff --git a/src/main/java/cn/lunadeer/dominion/dtos/Flag.java b/src/main/java/cn/lunadeer/dominion/dtos/Flag.java
index 9f93714..f658ad4 100644
--- a/src/main/java/cn/lunadeer/dominion/dtos/Flag.java
+++ b/src/main/java/cn/lunadeer/dominion/dtos/Flag.java
@@ -120,6 +120,26 @@ public enum Flag {
return Arrays.asList(Flag.values());
}
+ public static List getDominionOnlyFlagsEnabled() {
+ List flags = new ArrayList<>();
+ for (Flag flag : Flag.values()) {
+ if (!flag.dominion_only) {
+ continue;
+ }
+ if (!flag.enable) {
+ continue;
+ }
+ flags.add(flag);
+ }
+ Comparator