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

1

Browse Source
This commit is contained in:
aozhiwei 2019-04-16 11:54:45 +08:00
parent 3f87ed3fa7
commit 73fc8b0a3d
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

@ -74,7 +74,7 @@ void Bullet::OnHit(std::vector<Entity*>& objects)
case ET_Player: case ET_Player:
{ {
Human* hum = (Human*)target; Human* hum = (Human*)target;
if (!hum->dead) { if (!hum->dead && (hum->team_id == 0 || hum->team_id != player->team_id)) {
player->stats.damage_amount += 10; player->stats.damage_amount += 10;
hum->DecHP(10, player->entity_uniid, player->name); hum->DecHP(10, player->entity_uniid, player->name);
} }