Merge branch 'master' into dynmap-impl

# Conflicts:
#	pom.xml

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>Dominion</artifactId>
-    <version>1.35.9-dynmap-beta</version>
+    <version>1.35.10-dynmap-beta</version>
     <packaging>jar</packaging>
 
     <name>Dominion</name>
@@ -70,10 +70,6 @@
             <id>lunadeer-repo</id>
             <url>https://ssl.lunadeer.cn:14454/repository/maven-snapshots/</url>
         </repository>
-        <repository>
-            <id>MikeRepo</id>
-            <url>https://repo.mikeprimm.com/</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -99,11 +95,5 @@
             <artifactId>snakeyaml</artifactId>
             <version>2.0</version>
         </dependency>
-        <dependency>
-            <groupId>us.dynmap</groupId>
-            <artifactId>dynmap-api</artifactId>
-            <version>3.4-beta-3</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>

src/main/java/cn/lunadeer/dominion/controllers/DominionController.java

@@ -230,7 +230,7 @@ public class DominionController {
         AbstractOperator.Result SUCCESS = new AbstractOperator.Result(AbstractOperator.Result.SUCCESS, "成功扩展领地 %s %d格", dominion_name, size);
         // 检查经济
         handleEconomy(operator, Dominion.config.getEconomyOnlyXZ() ? sqr(newCords) - dominion.getSquare() : vol(newCords) - dominion.getVolume()
-                , false, FAIL, SUCCESS);
+                , true, FAIL, SUCCESS);
         // 显示粒子效果
         handleParticle(operator, dominion.getWorld(), newCords, FAIL);
         dominion.setXYZ(newCords);
@@ -445,7 +445,7 @@ public class DominionController {
                     "成功设置领地 %s 的传送点 %d %d %d", dominion_name
                     , loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
         } else {
-            operator.setResponse(new AbstractOperator.Result(AbstractOperator.Result.FAILURE, "传送点不在领地 %s 内", dominion_name));
+            operator.setResponse(FAIL.addMessage("传送点不在领地 %s 内", dominion_name));
         }
     }