diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 54308d4..b7c4b46 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -484,8 +484,9 @@ void Player::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAg Friend* friendobj = new Friend; TypeConvert::Convert(msg.context().user_info().base_data(), friendobj->base_data); TypeConvert::Convert(msg.context().user_info().temp_custom_data(), friendobj->temp_custom_data); - if (!AddFriend(friendobj)) { + if (AddFriend(friendobj) != 0) { delete friendobj; + return; } } @@ -592,7 +593,8 @@ void Player::ForwardGroupCMMsg(f8::MsgHdr& hdr, long long hash_code) 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() @@ -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.account_id }, - a8::XParams(), + param, on_ok, on_error, myself.crc32_code