From 0b101aa9612312f1bd53d2664a00b81b7ed8bf9d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 23 Oct 2022 09:42:13 +0800
Subject: [PATCH] 1

---
 server/gameserver/matchteam.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index dc274e56..7412d717 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -443,9 +443,16 @@ bool MatchTeam::CanCombine(MatchTeam* b)
 #endif
         return false;
     }
-    if (GetSlotNum() != b->GetSlotNum()) {
+    if (GetOwner()->msg->room_mode() != b->GetOwner()->msg->room_mode() ||
+        GetOwner()->msg->pve_instance_id() != b->GetOwner()->msg->pve_instance_id()) {
 #ifdef DEBUG
         a8::XPrintf("CanCombine 31\n", {});
+#endif
+        return false;
+    }
+    if (GetSlotNum() != b->GetSlotNum()) {
+#ifdef DEBUG
+        a8::XPrintf("CanCombine 32\n", {});
 #endif
         return false;
     }