diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc index f938d16..cc27518 100644 --- a/server/gameserver/roomobstacle.cc +++ b/server/gameserver/roomobstacle.cc @@ -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); } } diff --git a/third_party/tools b/third_party/tools index d80b40c..4ce83a4 160000 --- a/third_party/tools +++ b/third_party/tools @@ -1 +1 @@ -Subproject commit d80b40c567a3cf83984cee26d9df18d755f57a05 +Subproject commit 4ce83a44219390264b0ca6bb85541230f44827cf