实现了单独配置世界圈地规则的功能

ColdeZhang · Sep 6, 2024 · 40d4ede · 40d4ede
1 parent 1f3fb77
commit 40d4ede
Show file tree

Hide file tree

Showing 8 changed files with 363 additions and 627 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "cn.lunadeer"
-version = "2.5.7-beta"
+version = "2.6.0-beta"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(21))

diff --git a/core/src/main/java/cn/lunadeer/dominion/commands/SetConfig.java b/core/src/main/java/cn/lunadeer/dominion/commands/SetConfig.java
diff --git a/core/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java b/core/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java
@@ -103,6 +103,14 @@ public static void create(AbstractOperator operator, String name,
             operator.setResponse(FAIL.addMessage(Translation.Messages_SelectPointsWorldNotSame));
             return;
         }
+        if (operator.getLocation() == null) {
+            operator.setResponse(FAIL.addMessage(Translation.Messages_CommandPlayerOnly));
+            return;
+        }
+        if (!loc1.getWorld().getUID().equals(operator.getLocation().getWorld().getUID())) {
+            operator.setResponse(FAIL.addMessage(Translation.Messages_CrossWorldOperationDisallowed));
+            return;
+        }
         // 检查世界是否可以创建
         if (worldNotValid(operator, loc1.getWorld().getName())) {
             operator.setResponse(FAIL.addMessage(Translation.Messages_CreateDominionDisabledWorld, loc1.getWorld().getName()));