feat(军团活动): 诸侯混战已占领的城池不能宣战

This commit is contained in:
luying
2023-05-23 20:19:09 +08:00
parent 4849cde229
commit 1fda7ac77f

View File

@@ -133,10 +133,7 @@ export class CityActivityHandler {
let declareIndex = getDeclareIndex();
let checkResult = await GuildActivityCityDeclareModel.checkDeclartion(serverId, guildCode, declareIndex);
if (!!checkResult) return resResult(STATUS.HAS_DECLARED);
let curCity = await GuildActivityCityModel.getCity(serverId, cityId, declareIndex);
if (curCity && curCity.guardGuildCode) {
return resResult(STATUS.CITY_IS_GUARD);
}
await GuildActivityCityModel.getCity(serverId, cityId, declareIndex);
let declareResult = await declareCity(serverId, roleId, guildCode, cityId, false, declareIndex);
if(!declareResult) return resResult(STATUS.HAS_DECLARED);