From 4318712b63eedecf3ed12b1801fead17740aecda Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 18 Jun 2020 14:55:18 +0800
Subject: [PATCH] 1

---
 server/imserver/player.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 099a8a5..2f91334 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -180,6 +180,7 @@ void Player::_CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg)
 
 void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& msg)
 {
+    #if 0
     if (last_apply_idx_ > 0 &&
         last_apply_idx_ >= DBEngine::Instance()->GetFriendApplyCurrIdx(myself.crc32_code)) {
         cs::SMFriendApplyList respmsg;
@@ -187,6 +188,7 @@ void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& ms
         SendMsg(respmsg);
         return;
     }
+    #endif
 
     auto on_ok =
         [] (a8::XParams& param, const f8::DataSet* data_set)
@@ -368,7 +370,7 @@ void Player::_CMFriendDelete(f8::MsgHdr& hdr, const cs::CMFriendDelete& msg)
         {
             Player* hum = PlayerMgr::Instance()->GetPlayerByAccountId(p->base_data.account_id);
             if (hum) {
-                hum->RemoveFriend(p->base_data.account_id);
+                hum->RemoveFriend(AccountId());
             }
         }
 #endif
@@ -770,6 +772,7 @@ void Player::AddFriend(Friend* p)
     if (!GetFriendById(p->base_data.account_id)) {
         Friend* friendobj = new Friend;
         *friendobj = *p;
+        INIT_LIST_HEAD(&friendobj->watch_node);
         friendobj->crc32_code = a8::openssl::Crc32
             (
              (unsigned char*)friendobj->base_data.account_id.data(),