From a7423a63e937fa37a930b443367f58356ce958fe Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 2 Feb 2024 16:24:27 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 2eba5ff2..be9c3909 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2085,12 +2085,16 @@ void Room::RandRemoveAndroid() { Human* hum = nullptr; if (!hum) { - for (auto& pair : human_hash_) { - if (pair.second->IsAndroid() && pair.second->team_uuid.empty()) { - hum = pair.second; - break; - } - } + TraverseHumanList + ( + [&hum] (Human* ele_hum) -> bool + { + if (ele_hum->IsAndroid() && ele_hum->team_uuid.empty()) { + hum = ele_hum; + return false; + } + return true; + }); } if (hum) { if (hum->team_id != 0) {