This commit is contained in:
殷勇 2023-09-20 19:29:10 +08:00
parent acb58eba2a
commit f4ddd7c2f7

View File

@ -341,12 +341,11 @@ func (p *Player) CMApplyToGuild(hdr *f5.MsgHdr, msg *cs.CMApplyToGuild) {
for targetAccountId := range guild.Members { for targetAccountId := range guild.Members {
target := playerMgr.GetPlayerByAccountId(targetAccountId) target := playerMgr.GetPlayerByAccountId(targetAccountId)
if target == nil { if target != nil {
continue
}
target.SendMsg(rspNotify) target.SendMsg(rspNotify)
} }
} }
}
}, },
) )
} }
@ -365,12 +364,11 @@ func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) {
Level: q5.ToInt32(GuildMemberLevelDefault), Level: q5.ToInt32(GuildMemberLevelDefault),
} }
rspMember := p.FillMFGuildMember(member) rspMember := p.FillMFGuildMember(member)
if rspMember == nil { if rspMember != nil {
continue
}
rspMsg.Members = append(rspMsg.Members, rspMember) rspMsg.Members = append(rspMsg.Members, rspMember)
} }
} }
}
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
} }
@ -399,12 +397,11 @@ func (p *Player) CMApprove(hdr *f5.MsgHdr, msg *cs.CMApprove) {
for targetAccountId := range guild.Members { for targetAccountId := range guild.Members {
target := playerMgr.GetPlayerByAccountId(targetAccountId) target := playerMgr.GetPlayerByAccountId(targetAccountId)
if target == nil { if target != nil {
continue
}
target.SendMsg(rspNotify) target.SendMsg(rspNotify)
} }
} }
}
}, },
) )
} }
@ -449,12 +446,11 @@ func (p *Player) CMLeaveGuild(hdr *f5.MsgHdr, msg *cs.CMLeaveGuild) {
for targetAccountId := range guild.Members { for targetAccountId := range guild.Members {
target := playerMgr.GetPlayerByAccountId(targetAccountId) target := playerMgr.GetPlayerByAccountId(targetAccountId)
if target == nil { if target != nil {
continue
}
target.SendMsg(rspNotify) target.SendMsg(rspNotify)
} }
} }
}
}, },
) )
} }
@ -484,11 +480,10 @@ func (p *Player) CMDismissMember(hdr *f5.MsgHdr, msg *cs.CMDismissMember) {
for targetAccountId := range guild.Members { for targetAccountId := range guild.Members {
target := playerMgr.GetPlayerByAccountId(targetAccountId) target := playerMgr.GetPlayerByAccountId(targetAccountId)
if target == nil { if target != nil {
continue
}
target.SendMsg(rspNotify) target.SendMsg(rspNotify)
} }
}
dismissAccount := playerMgr.GetPlayerByAccountId(msg.GetDismissAccountId()) dismissAccount := playerMgr.GetPlayerByAccountId(msg.GetDismissAccountId())
if dismissAccount != nil { if dismissAccount != nil {
@ -527,13 +522,11 @@ func (p *Player) CMSetMemberLevel(hdr *f5.MsgHdr, msg *cs.CMSetMemberLevel) {
for targetAccountId := range guild.Members { for targetAccountId := range guild.Members {
target := playerMgr.GetPlayerByAccountId(targetAccountId) target := playerMgr.GetPlayerByAccountId(targetAccountId)
if target == nil { if target != nil {
continue
}
target.SendMsg(rspNotify) target.SendMsg(rspNotify)
} }
} }
}
}) })
} }