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

炸弹不区分敌我

Browse Source
This commit is contained in:
aozhiwei 2020-03-25 15:20:39 +08:00
parent 610847d241
commit b046afe4b7
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/bullet.cc
View File

@ -52,7 +52,7 @@ void Bullet::OnHit(std::set<Entity*>& objects)
} }
Human* hum = (Human*)target; Human* hum = (Human*)target;
#if 1 #if 1
if (!hum->dead && player->team_id != hum->team_id) { if (!hum->dead && (IsBomb() || player->team_id != hum->team_id)) {
#else #else
if (hum != player && !hum->dead && if (hum != player && !hum->dead &&
(hum->team_id == 0 || player->team_id != hum->team_id)) { (hum->team_id == 0 || player->team_id != hum->team_id)) {