1
This commit is contained in:
parent
ac48851fc0
commit
e60d7eec58
@ -171,7 +171,7 @@ func (this *guildMgr) isValidGuildJob(guildJob int32) bool {
|
||||
guildJob == constant.GuildMemberLevelDefault
|
||||
}
|
||||
|
||||
func (this *guildMgr) asyncCreateGuildTask(task *f5.AsyncTask,
|
||||
func (this *guildMgr) asyncCreateGuildTask(task *f5.LockAsyncTask,
|
||||
guildId string, accountId string, avatar int32, name string,
|
||||
cb func(int32, string, string)) {
|
||||
if this.internalGetGuildByAccountId(accountId) != nil {
|
||||
@ -395,7 +395,7 @@ func (this *guildMgr) AsyncApplyJoin(accountId string, guildId string, cb func(i
|
||||
})
|
||||
}
|
||||
|
||||
func (this *guildMgr) asyncAcceptApplyTask(task *f5.AsyncTask, guild *guild,
|
||||
func (this *guildMgr) asyncAcceptApplyTask(task *f5.LockAsyncTask, guild *guild,
|
||||
accountId string, targetId string, cb func(int32, string)) {
|
||||
if !guild.isOwner(accountId) {
|
||||
task.SetFail()
|
||||
@ -467,7 +467,7 @@ func (this *guildMgr) AsyncAcceptApply(accountId string, targetId string, cb fun
|
||||
{constant.MEMBER_LOCK_KEY, targetId},
|
||||
{constant.GUILD_ID_LOCK_KEY, guild.guildId},
|
||||
},
|
||||
func (task *f5.AsyncTask) {
|
||||
func (task *f5.LockAsyncTask) {
|
||||
this.asyncAcceptApplyTask(task, guild, accountId, targetId, cb)
|
||||
})
|
||||
}
|
||||
|
2
third_party/f5
vendored
2
third_party/f5
vendored
@ -1 +1 @@
|
||||
Subproject commit d785be5e3718354db6b9f2a7ca710d3cff65be5c
|
||||
Subproject commit c1fe4f0cb152185fd022522a67267b317acb51a7
|
Loading…
x
Reference in New Issue
Block a user