From b08e14d2cb17880b3ddeb0c06e33b0ef7e9ad17e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 16 Apr 2019 15:56:30 +0800 Subject: [PATCH] 1 --- server/gameserver/bullet.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 08b2d70..d927200 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -74,7 +74,11 @@ void Bullet::OnHit(std::vector& objects) case ET_Player: { Human* hum = (Human*)target; +#if 1 + if (!hum->dead) { +#else if (!hum->dead && (hum->team_id == 0 || hum->team_id != player->team_id)) { +#endif player->stats.damage_amount += 10; hum->DecHP(10, player->entity_uniid, player->name); }