mirror of
https://github.com/ColdeZhang/Dominion.git
synced 2024-10-19 02:46:49 +08:00
优化转移领地所有权的逻辑校验
This commit is contained in:
parent
46d15d01eb
commit
bdfb368716
2
pom.xml
2
pom.xml
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>cn.lunadeer</groupId>
|
<groupId>cn.lunadeer</groupId>
|
||||||
<artifactId>Dominion</artifactId>
|
<artifactId>Dominion</artifactId>
|
||||||
<version>1.42.4-beta</version>
|
<version>1.42.5-beta</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>Dominion</name>
|
<name>Dominion</name>
|
||||||
|
@ -536,10 +536,6 @@ public class DominionController {
|
|||||||
operator.setResponse(FAIL.addMessage("操作者信息丢失,请联系管理员"));
|
operator.setResponse(FAIL.addMessage("操作者信息丢失,请联系管理员"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (Objects.equals(player_name, operatorDTO.getLastKnownName())) {
|
|
||||||
operator.setResponse(FAIL.addMessage("不能将领地转让给自己"));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
DominionDTO dominion = getExistDomAndIsOwner(operator, dom_name);
|
DominionDTO dominion = getExistDomAndIsOwner(operator, dom_name);
|
||||||
if (dominion == null) {
|
if (dominion == null) {
|
||||||
return;
|
return;
|
||||||
@ -549,6 +545,10 @@ public class DominionController {
|
|||||||
operator.setResponse(FAIL.addMessage("玩家 %s 不存在", player_name));
|
operator.setResponse(FAIL.addMessage("玩家 %s 不存在", player_name));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (Objects.equals(dominion.getOwner(), player.getUuid())) {
|
||||||
|
operator.setResponse(FAIL.addMessage("领地 %s 已经属于 %s,无需转移", dom_name, player_name));
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (dominion.getParentDomId() != -1) {
|
if (dominion.getParentDomId() != -1) {
|
||||||
operator.setResponse(FAIL.addMessage("子领地无法转让,你可以通过将 %s 设置为管理员来让其管理领地 %s ", player_name, dom_name));
|
operator.setResponse(FAIL.addMessage("子领地无法转让,你可以通过将 %s 设置为管理员来让其管理领地 %s ", player_name, dom_name));
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user