From 9455ae18881ebcfd30dda4e68667e76e34984bc7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 13 Oct 2022 19:19:38 +0800
Subject: [PATCH] 1

---
 server/gameserver/matchteam.cc | 11 +++++++++++
 server/gameserver/matchteam.h  |  1 +
 2 files changed, 12 insertions(+)

diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index d0918da4..91203905 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -448,6 +448,12 @@ bool MatchTeam::CanCombine(MatchTeam* b)
     if (b->phase_ != kMatchCombining) {
 #ifdef DEBUG
         a8::XPrintf("CanCombine 5\n", {});
+#endif
+        return false;
+    }
+    if (GetSlotNum() != b->GetSlotNum()) {
+#ifdef DEBUG
+        a8::XPrintf("CanCombine 31\n", {});
 #endif
         return false;
     }
@@ -764,3 +770,8 @@ void MatchTeam::RemoveTeam()
     }
     MatchMgr::Instance()->RemoveTeam(GetTeamUUid());
 }
+
+int MatchTeam::GetSlotNum()
+{
+    return first_member_->msg->team_slot_num();
+}
diff --git a/server/gameserver/matchteam.h b/server/gameserver/matchteam.h
index ad7a5cce..5bb16bb4 100644
--- a/server/gameserver/matchteam.h
+++ b/server/gameserver/matchteam.h
@@ -73,6 +73,7 @@ class MatchTeam
     int GetMapId();
     std::list<std::shared_ptr<RawTeamMember>>& GetCurrMembers() { return curr_member_hash_; };
     std::shared_ptr<RawTeamMember> GetOwner() { return first_member_; };
+    int GetSlotNum();
 
  private:
     void Update();