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-07-02 10:58:27 +08:00
parent 2077df9c13
commit 4af9244511
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/imserver/player.cc
View File

@ -371,11 +371,6 @@ void Player::_CMFriendAddBlack(f8::MsgHdr& hdr, const cs::CMFriendAddBlack& msg)
Friend* p = GetFriendById(msg.user_info().base_data().account_id()); Friend* p = GetFriendById(msg.user_info().base_data().account_id());
if (p) { if (p) {
if (!GetBlackListById(msg.user_info().base_data().account_id())) { if (!GetBlackListById(msg.user_info().base_data().account_id())) {
{
cs::SMDeleteFriendNotify notifymsg;
notifymsg.add_user_list(msg.user_info().base_data().account_id());
SendMsg(notifymsg);
}
{ {
cs::SMAddBlackListNotify notifymsg; cs::SMAddBlackListNotify notifymsg;
auto user_info = notifymsg.add_user_infos(); auto user_info = notifymsg.add_user_infos();
@ -383,8 +378,8 @@ void Player::_CMFriendAddBlack(f8::MsgHdr& hdr, const cs::CMFriendAddBlack& msg)
TypeConvert::Convert(p->temp_custom_data, *user_info->mutable_temp_custom_data()); TypeConvert::Convert(p->temp_custom_data, *user_info->mutable_temp_custom_data());
SendMsg(notifymsg); SendMsg(notifymsg);
} }
friend_hash_.erase(p->base_data.account_id);
black_hash_[p->base_data.account_id] = p; black_hash_[p->base_data.account_id] = p;
RemoveFriend(p->base_data.account_id, true);
MarkDirty(); MarkDirty();
} }
ShowErrorMsg("成功添加到黑名单"); ShowErrorMsg("成功添加到黑名单");