diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 66316f18..ca29f3a1 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -3418,15 +3418,22 @@ void Room::ForceOver()
              if (team->HasAliveMember()) {
                  alive_teams.push_back(team);
              }
+             team->HasPlayer();
              return true;
          });
     std::sort(alive_teams.begin(), alive_teams.end(),
               [] (Team* a, Team *b) -> bool
               {
+                  if (a->HasPlayer() && b->HasPlayer()) {
+                      return a->GetTeamId() < b->GetTeamId();
+                  }
                   if (a->HasPlayer()) {
                       return true;
                   }
-                  return false;
+                  if (b->HasPlayer()) {
+                      return false;
+                  }
+                  return a->GetTeamId() < b->GetTeamId();
               });
     for (Team* team : alive_teams) {
         team->TraverseMembers
diff --git a/server/robotserver/playermgr.cc b/server/robotserver/playermgr.cc
index 7f10e6d3..2791a4eb 100644
--- a/server/robotserver/playermgr.cc
+++ b/server/robotserver/playermgr.cc
@@ -17,7 +17,7 @@
 
 void PlayerMgr::Init()
 {
-    for (int i = 1; i <= 40; ++i) {
+    for (int i = 1; i <= 19; ++i) {
         int idx = i;
         std::string account_id = a8::Format("6513_2006_%d", {idx});
         auto hum = std::make_shared<Player>();