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

1

Browse Source
This commit is contained in:
aozhiwei 2021-08-30 15:42:06 +08:00
commit 6b48c7fd66
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/roomobstacle.cc
View File

@ -208,9 +208,10 @@ void RoomObstacle::SpecExplosion()
room->grid_service->TraverseAllLayerHumanList
(room->GetRoomIdx(),
*grid_list_,
[this, &human_list] (Human* hum, bool& stop)
[this, &human_list, &bomb_pos] (Human* hum, bool& stop)
{
if (master.Get()->team_id != hum->team_id && TestCollision(room, hum)) {
if (master.Get()->team_id != hum->team_id &&
bomb_pos.Distance(hum->GetPos()) < meta->i->damage_dia()) {
human_list.insert(hum);
}
}

2
third_party/tools vendored

@ -1 +1 @@
Subproject commit d80b40c567a3cf83984cee26d9df18d755f57a05
Subproject commit 4ce83a44219390264b0ca6bb85541230f44827cf