1
This commit is contained in:
parent
fe3c001cb7
commit
f27e2d721e
@ -779,7 +779,7 @@ func (this *guildMgr) clearEmptyGuild() {
|
|||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
for _, g := range(emptyGuilds) {
|
for _, g := range(emptyGuilds) {
|
||||||
this.delGuild(g)
|
this.delGuildNoRearrangement(g)
|
||||||
GetDbLogMgr().GuildClearEmptyStart(g.guildId, g.guildName)
|
GetDbLogMgr().GuildClearEmptyStart(g.guildId, g.guildName)
|
||||||
model.Guild.Delete(g.guildId,
|
model.Guild.Delete(g.guildId,
|
||||||
func (err error, lastInsertId int64, rowsAffected int64) {
|
func (err error, lastInsertId int64, rowsAffected int64) {
|
||||||
@ -853,6 +853,13 @@ func (this *guildMgr) delGuildMember(memberId string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (this *guildMgr) delGuild(g *guild) {
|
func (this *guildMgr) delGuild(g *guild) {
|
||||||
|
this.delGuildNoRearrangement(g)
|
||||||
|
if _, ok := this.guildRankHash[g.guildId]; ok {
|
||||||
|
this.rearrangement()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (this *guildMgr) delGuildNoRearrangement(g *guild) {
|
||||||
g.traverseMembers(
|
g.traverseMembers(
|
||||||
func (m *member) bool {
|
func (m *member) bool {
|
||||||
this.delGuildMember(m.memberId)
|
this.delGuildMember(m.memberId)
|
||||||
@ -860,7 +867,4 @@ func (this *guildMgr) delGuild(g *guild) {
|
|||||||
})
|
})
|
||||||
delete(this.idHash, g.guildId)
|
delete(this.idHash, g.guildId)
|
||||||
delete(this.nameHash, g.guildName)
|
delete(this.nameHash, g.guildName)
|
||||||
if _, ok := this.guildRankHash[g.guildId]; ok {
|
|
||||||
this.rearrangement()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user