Merge branch 'master' into dynmap-impl
# Conflicts: # pom.xml
This commit is contained in:
commit
95d6d809b0
12
pom.xml
12
pom.xml
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>cn.lunadeer</groupId>
|
<groupId>cn.lunadeer</groupId>
|
||||||
<artifactId>Dominion</artifactId>
|
<artifactId>Dominion</artifactId>
|
||||||
<version>1.35.9-dynmap-beta</version>
|
<version>1.35.10-dynmap-beta</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>Dominion</name>
|
<name>Dominion</name>
|
||||||
@ -70,10 +70,6 @@
|
|||||||
<id>lunadeer-repo</id>
|
<id>lunadeer-repo</id>
|
||||||
<url>https://ssl.lunadeer.cn:14454/repository/maven-snapshots/</url>
|
<url>https://ssl.lunadeer.cn:14454/repository/maven-snapshots/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
|
||||||
<id>MikeRepo</id>
|
|
||||||
<url>https://repo.mikeprimm.com/</url>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@ -99,11 +95,5 @@
|
|||||||
<artifactId>snakeyaml</artifactId>
|
<artifactId>snakeyaml</artifactId>
|
||||||
<version>2.0</version>
|
<version>2.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>us.dynmap</groupId>
|
|
||||||
<artifactId>dynmap-api</artifactId>
|
|
||||||
<version>3.4-beta-3</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
@ -230,7 +230,7 @@ public class DominionController {
|
|||||||
AbstractOperator.Result SUCCESS = new AbstractOperator.Result(AbstractOperator.Result.SUCCESS, "成功扩展领地 %s %d格", dominion_name, size);
|
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()
|
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);
|
handleParticle(operator, dominion.getWorld(), newCords, FAIL);
|
||||||
dominion.setXYZ(newCords);
|
dominion.setXYZ(newCords);
|
||||||
@ -445,7 +445,7 @@ public class DominionController {
|
|||||||
"成功设置领地 %s 的传送点 %d %d %d", dominion_name
|
"成功设置领地 %s 的传送点 %d %d %d", dominion_name
|
||||||
, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
|
, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
|
||||||
} else {
|
} else {
|
||||||
operator.setResponse(new AbstractOperator.Result(AbstractOperator.Result.FAILURE, "传送点不在领地 %s 内", dominion_name));
|
operator.setResponse(FAIL.addMessage("传送点不在领地 %s 内", dominion_name));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user