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-06-23 14:16:36 +08:00
parent 2c3ca4cf20
commit 1f6a5efd88
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/imserver/player.cc
View File

@ -484,8 +484,9 @@ void Player::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAg
Friend* friendobj = new Friend; Friend* friendobj = new Friend;
TypeConvert::Convert(msg.context().user_info().base_data(), friendobj->base_data); TypeConvert::Convert(msg.context().user_info().base_data(), friendobj->base_data);
TypeConvert::Convert(msg.context().user_info().temp_custom_data(), friendobj->temp_custom_data); TypeConvert::Convert(msg.context().user_info().temp_custom_data(), friendobj->temp_custom_data);
if (!AddFriend(friendobj)) { if (AddFriend(friendobj) != 0) {
delete friendobj; delete friendobj;
return;
} }
} }
@ -592,7 +593,8 @@ void Player::ForwardGroupCMMsg(f8::MsgHdr& hdr, long long hash_code)
void Player::FillMFUserInfo(cs::MFUserInfo* user_info) void Player::FillMFUserInfo(cs::MFUserInfo* user_info)
{ {
TypeConvert::Convert(myself.base_data, *(user_info->mutable_base_data()));
TypeConvert::Convert(myself.temp_custom_data, *(user_info->mutable_temp_custom_data()));
} }
void Player::MarkDirty() void Player::MarkDirty()
@ -641,7 +643,7 @@ void Player::SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBO
myself.base_data.base_data_version, myself.base_data.base_data_version,
myself.base_data.account_id myself.base_data.account_id
}, },
a8::XParams(), param,
on_ok, on_ok,
on_error, on_error,
myself.crc32_code myself.crc32_code