From d860732a738f0cbc2c7f9241489f44f813d7e278 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 22 Sep 2023 08:19:06 +0800
Subject: [PATCH] 1

---
 server/gameserver/custom_member.h | 1 +
 server/gameserver/roommgr.cc      | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/server/gameserver/custom_member.h b/server/gameserver/custom_member.h
index ff439e68..efde43bb 100644
--- a/server/gameserver/custom_member.h
+++ b/server/gameserver/custom_member.h
@@ -10,6 +10,7 @@ class CustomMember
     bool IsJoined() { return joined_; }
     int GetJoinTime() { return join_time_; }
     const std::string& GetAccountId() { return account_id_; }
+    const std::string& GetSessionId() { return session_id_; }
     std::shared_ptr<BattleDataContext>& GetNetData() { return battle_context_; };
 
  private:
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 06f21af7..e5b1d238 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -808,6 +808,11 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
 {
     msg->set_force_enter_newbie_room(false);
     msg->set_pve_instance_id(0);
+#ifdef DEBUG
+    {
+        std::string custom_data = "";
+    }
+#endif
 #ifdef DEBUG
 #else
     if (msg->proto_version() < cs::ProtoVersion) {
@@ -905,6 +910,8 @@ void RoomMgr::_CMJoinCustomBattle(f8::MsgHdr& hdr, const cs::CMJoin& msg)
             hum->battle_uuid = member->GetNetData()->battle_uuid;
             hum->is_valid_battle = member->GetNetData()->is_valid_battle;
             hum->payload = member->GetNetData()->payload;
+            msg.set_session_id(member->GetSessionId());
+            msg.set_team_uuid(team->GetTeamUuid());
             PlayerMgr::Instance()->
                 CreatePlayerByCMJoin(hum,
                                      ip_saddr,