diff --git a/server/imserver/player.cc b/server/imserver/player.cc index a7e6ab9..7f491f0 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -371,11 +371,6 @@ void Player::_CMFriendAddBlack(f8::MsgHdr& hdr, const cs::CMFriendAddBlack& msg) Friend* p = GetFriendById(msg.user_info().base_data().account_id()); if (p) { 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; 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()); SendMsg(notifymsg); } - friend_hash_.erase(p->base_data.account_id); black_hash_[p->base_data.account_id] = p; + RemoveFriend(p->base_data.account_id, true); MarkDirty(); } ShowErrorMsg("成功添加到黑名单");