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

1

Browse Source
This commit is contained in:
aozhiwei 2020-09-27 13:09:32 +08:00
parent d1d4171a44
commit ae2c35fdf5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/imserver/guild.cc
View File

@ -145,7 +145,11 @@ void Guild::_CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg)
GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
forward_msg->context(),
respmsg);
if (!GetMember(forward_msg->context().user_info().base_data().account_id())) {
GuildMember* member = GetMember(forward_msg->context().user_info().base_data().account_id());
if (member) {
} else {
DBHelper::Instance()->AddGuildApply(this, forward_msg->context().user_info());
}
}

2
third_party/framework vendored

@ -1 +1 @@
Subproject commit 579efb2289bc7391e68875fc58ada395ca1a6e2a
Subproject commit bd30c666bf2a5c909dafe6b458fce62d007d9a56