From b046afe4b77d4f98f70a09da342d13f029fae3c8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 25 Mar 2020 15:20:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B8=E5=BC=B9=E4=B8=8D=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E6=95=8C=E6=88=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/bullet.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 9e622c1..dbcc10f 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -52,7 +52,7 @@ void Bullet::OnHit(std::set& objects) } Human* hum = (Human*)target; #if 1 - if (!hum->dead && player->team_id != hum->team_id) { + if (!hum->dead && (IsBomb() || player->team_id != hum->team_id)) { #else if (hum != player && !hum->dead && (hum->team_id == 0 || player->team_id != hum->team_id)) {