diff --git a/pom.xml b/pom.xml index 4f22e69..6c92dee 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.42.4-beta + 1.42.5-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java index 47be960..44ddb60 100644 --- a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java +++ b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java @@ -536,10 +536,6 @@ public class DominionController { operator.setResponse(FAIL.addMessage("操作者信息丢失,请联系管理员")); return; } - if (Objects.equals(player_name, operatorDTO.getLastKnownName())) { - operator.setResponse(FAIL.addMessage("不能将领地转让给自己")); - return; - } DominionDTO dominion = getExistDomAndIsOwner(operator, dom_name); if (dominion == null) { return; @@ -549,6 +545,10 @@ public class DominionController { operator.setResponse(FAIL.addMessage("玩家 %s 不存在", player_name)); return; } + if (Objects.equals(dominion.getOwner(), player.getUuid())) { + operator.setResponse(FAIL.addMessage("领地 %s 已经属于 %s,无需转移", dom_name, player_name)); + return; + } if (dominion.getParentDomId() != -1) { operator.setResponse(FAIL.addMessage("子领地无法转让,你可以通过将 %s 设置为管理员来让其管理领地 %s ", player_name, dom_name)); return;