server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
殷勇 2023-09-07 11:25:49 +08:00
parent 85460c7183
commit 8bb4307bf0
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/imserver/guild.go
View File

@ -75,9 +75,7 @@ func (g *Guild) IsFull() bool {
// AddMember 添加成员 // AddMember 添加成员
func (g *Guild) AddMember(member *GuildMember) { func (g *Guild) AddMember(member *GuildMember) {
if !g.IsFull() { g.Members = append(g.Members, member)
g.Members = append(g.Members, member)
}
} }
// RemoveMember 移除成员 // RemoveMember 移除成员

10
server/imserver/guildmgr.go
View File

@ -113,7 +113,6 @@ func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb fu
cb(ERR_CODE_GUILD_NO_EXISTS, "ApplyToGuild guild no exists") cb(ERR_CODE_GUILD_NO_EXISTS, "ApplyToGuild guild no exists")
return return
} }
// 是否加入其他公会 // 是否加入其他公会
if !gm.CheckJoinGuild(applicantAccountId) { if !gm.CheckJoinGuild(applicantAccountId) {
cb(ERR_CODE_JOINED_GUILD, "ApplyToGuild joined guild") cb(ERR_CODE_JOINED_GUILD, "ApplyToGuild joined guild")
@ -124,7 +123,6 @@ func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb fu
cb(ERR_CODE_GUILD_MEMBER_FULL, "ApplyToGuild guild member full") cb(ERR_CODE_GUILD_MEMBER_FULL, "ApplyToGuild guild member full")
return return
} }
// 可直接加入 // 可直接加入
if guild.JoinCond == JoinCondFree { if guild.JoinCond == JoinCondFree {
gm.JoinGuild(guild, applicantAccountId) gm.JoinGuild(guild, applicantAccountId)
@ -203,10 +201,6 @@ func (gm *GuildMgr) Approve(operatorAccountId, accountId string, cb func(errCode
return return
} }
if guild.IsFull() {
cb(ERR_CODE_GUILD_MEMBER_FULL, "Approve guild member full")
return
}
guildId := guild.GuildId guildId := guild.GuildId
// 是否在申请队列中 // 是否在申请队列中
pendingReqStatus := guild.GetPendingReqStatus(accountId) pendingReqStatus := guild.GetPendingReqStatus(accountId)
@ -215,6 +209,10 @@ func (gm *GuildMgr) Approve(operatorAccountId, accountId string, cb func(errCode
return return
} }
if guild.IsFull() {
cb(ERR_CODE_GUILD_MEMBER_FULL, "Approve guild member full")
return
}
newMember := &GuildMember{AccountId: accountId, Level: GuildMemberLevelDefault} newMember := &GuildMember{AccountId: accountId, Level: GuildMemberLevelDefault}
gm.upsertGuildMember(guildId, newMember, func(err error) { gm.upsertGuildMember(guildId, newMember, func(err error) {
if err != nil { if err != nil {