1

server/gameserver/room.cc

@@ -1644,9 +1644,13 @@ void Room::CombineTeam()
 
 void Room::FillTeam()
 {
-    for (auto& pair : accountid_hash_) {
+    std::vector<Team*> free_team_list;
-
+    for (auto& pair : team_hash_) {
+        if (pair.second->IsFreeTeam()) {
+            free_team_list.push_back(pair.second);
+        }
     }
+    std::random_shuffle(free_team_list.begin(), free_team_list.end());
 }
 
 void Room::InitAirDrop()

server/gameserver/team.cc

@@ -152,3 +152,15 @@ bool Team::HasReviveCoin(Human* member)
     }
     return false;
 }
+
+bool Team::IsFreeTeam()
+{
+    if (members_.size() == 1) {
+        for (Human* member : members_) {
+            if (member->IsAndroid()) {
+                return true;
+            }
+        }
+    }
+    return false;
+}

server/gameserver/team.h

@@ -29,6 +29,7 @@ class Team
     Human* GetMemberByUniId(int member_id);
     int GetInitTeamMemberNum() { return init_team_member_num_; };
     bool HasReviveCoin(Human* member);
+    bool IsFreeTeam();
 
  private:
     int team_id_ = 0;