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

自爆不打自己人

Browse Source
This commit is contained in:
aozhiwei 2019-04-28 17:53:17 +08:00
parent 21f1e30ae1
commit fe942b0543
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/room.cc
View File

@ -538,7 +538,7 @@ void Room::OnHumanDie(Human* hum)
{ {
if (hum->skill_meta && hum->skill_meta->i->condition() == ST_SelfDetonate) { if (hum->skill_meta && hum->skill_meta->i->condition() == ST_SelfDetonate) {
for (auto& pair : human_hash_) { for (auto& pair : human_hash_) {
if (pair.second != hum) { if (pair.second != hum && (pair.second->team_id == 0 || pair.second->team_id != hum->team_id)) {
float distance = (hum->pos - pair.second->pos).Norm(); float distance = (hum->pos - pair.second->pos).Norm();
if (distance <= hum->skill_meta->i->area()) { if (distance <= hum->skill_meta->i->area()) {
pair.second->DecHP(hum->skill_meta->i->value1(), pair.second->DecHP(hum->skill_meta->i->value1(),