1

2021-09-07 11:51:19 +00:00 · 2021-09-07 11:51:19 +00:00 · 06c4cfe198
commit 06c4cfe198
parent 3c77e04f00
1 changed files with 0 additions and 2 deletions
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@ -1379,11 +1379,9 @@ void Room::MatchTeam(Human* hum)

 void Room::CombineTeam()
 {
-    #if 0
    if (MetaMgr::Instance()->prebattle_combine_team) {
        return;
    }
-    #endif
    std::map<int, size_t> need_combine_teams;
    std::map<int, size_t> need_combine_teams_copy;