From 74c4733243b9de9e7344bf3b06e785eb1b4acee7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 23 Oct 2022 13:32:57 +0800
Subject: [PATCH] 1

---
 server/gameserver/matchteam.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index d8826893..5e2a806d 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -251,7 +251,7 @@ void MatchTeam::SyncMatchInfo()
 {
     cs::SMUpdateMatchInfo notifymsg;
     for (auto member : curr_member_hash_) {
-        if (member->team == this) {
+        if (phase_ > kMatchCombining || member->team == this) {
             member->FillMFMatchTeamMember(notifymsg.mutable_info()->add_members());
         }
     }
@@ -317,9 +317,7 @@ void MatchTeam::UpdateMaster()
             CheckPrepare();
             if ((phase_left_time_ <= MetaMgr::Instance()->match_lock_time) ||
                 IsAllPrepare()) {
-                for (int i = 0; i < GetSlotNum(); ++i) {
-                    AutoChoose(true);
-                }
+                AutoChoose(true);
                 for (auto& member : curr_member_hash_) {
                     member->state = kMatchPrepare;
                 }