server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-02-02 16:03:59 +08:00
parent 3588c93f0e
commit 99dfdb022a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/gameserver/room.cc
View File

@ -959,20 +959,21 @@ Human* Room::GetWatchWarTarget(Human* hum)
std::vector<Human*> players; std::vector<Human*> players;
std::vector<Human*> humans; std::vector<Human*> humans;
for (auto& pair : human_hash_) { TraverseHumanList
if (pair.first != hum->GetUniId() && (
!pair.second->dead && [hum, &players, &humans] (Human* ele_hum) -> bool
!a8::HasBitFlag(pair.second->status, CS_Disable)) { {
if (pair.second->IsOb()) { if (ele_hum->GetUniId() != hum->GetUniId() &&
continue; !ele_hum->dead &&
} !a8::HasBitFlag(ele_hum->status, CS_Disable)) {
if (pair.second->IsPlayer()) { if (ele_hum->IsPlayer()) {
players.push_back(pair.second); players.push_back(ele_hum);
} else { } else {
humans.push_back(pair.second); humans.push_back(ele_hum);
} }
} }
} return true;
});
Human* target = nullptr; Human* target = nullptr;
if (!players.empty()) { if (!players.empty()) {