diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 1ec3c31..1b89237 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1681,9 +1681,10 @@ void Room::SecondRandPoint() void Room::NotifyGameStart() { - if (room_type == RT_NewBrid) { + if (room_type == RT_NewBrid || room_type == RT_MidBrid) { for (auto& pair : human_hash_) { - if (pair.second->entity_subtype == EST_Android && + if (pair.second->IsAndroid() && + pair.second->team_uuid.empty() && !a8::HasBitFlag(pair.second->status, HS_Disable)) { DisableHuman(pair.second); } @@ -1731,7 +1732,9 @@ void Room::NotifyGameStart() &xtimer_attacher_.timer_list_); } if (room_type == RT_MidBrid) { + #if 0 ShuaAndroidTimerFunc(); + #endif DieAndroidTimerFunc(); } }