From b0aed04798eeae3e7829ff3105fe101c20d693ed Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 22 Oct 2022 09:46:26 +0800
Subject: [PATCH] 1

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

diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index 0822024f..71d12a47 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -292,11 +292,11 @@ void MatchTeam::UpdateMaster()
     case kMatchCombining:
         {
             if (IsShuaRobotTime()) {
-                if (curr_member_hash_.size() < GetSlotNum()) {
+                if (HaveEmptySlot()) {
                     ShuaRobot();
                 }
             } else {
-                if (GetPredictMemberNum() < GetSlotNum()) {
+                if (HaveEmptySlot()) {
                     TryCombineTeam();
                 }
             }