diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 2f55a08e..3fe57284 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -601,10 +601,14 @@ Human* Room::CreateAndroidWithCustomMember(std::shared_ptr custom_ hum->Initialize(); AddToEntityHash(hum); AddToHumanHash(hum); - if (team) { - team->AddMember(hum); - } else { + if (GetMapModeMeta()->mapMode() != mt::kCircuitMatchMode) { MatchTeam(hum); + } else { + if (team) { + team->AddMember(hum); + } else { + MatchTeam(hum); + } } if (!hum->IsOb()) { IncAliveCount();