From 2ae6a19c7472d78f2681ca1d9c24e493389266dd Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 28 Dec 2023 13:44:03 +0800
Subject: [PATCH] 1

---
 server/gameserver/pbutils.cc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 174f64c0..7d1dffd2 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -2256,10 +2256,19 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
         moba_teams.size() > 2) {
         abort();
     }
-    for (size_t i = 0; i < moba_teams.size(); ++i) {
+    std::vector<std::shared_ptr<Team>> room_teams;
+    {
         auto new_team = NewTeam();
-        new_team->SetInitTeamMemberNum(moba_teams.at(i)->GetMemberNum());
+        new_team->SetInitTeamMemberNum(0);
         new_team->SetAutoFill(true);
+    }
+    {
+        auto new_team = NewTeam();
+        new_team->SetInitTeamMemberNum(0);
+        new_team->SetAutoFill(true);
+    }
+    for (size_t i = 0; i < moba_teams.size(); ++i) {
+        auto new_team = room_teams.at(i);
         moba_teams.at(i)->TraverseMember
             (
              [ip_saddr, socket_handle, msg, p, new_team] (std::shared_ptr<MobaMember> m) -> bool
@@ -2298,7 +2307,6 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
                  hum->ProcSkillList();
                  hum->SetHP(hum->GetBattleContext()->GetMaxHP());
                  hum->SetMaxHP(hum->GetHP());
-                 //member->Join(hum);
                  PlayerMgr::Instance()->IncAccountNum(msg->account_id());
                  RoomMgr::Instance()->OnJoinRoomOk(*msg, hum);
                  new_team->AddMember(hum);