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

1

Browse Source
This commit is contained in:
aozhiwei 2021-08-30 09:45:05 +00:00
parent 164a0b0a3d
commit d90a60a00f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/bullet.cc
View File

@ -226,6 +226,9 @@ void Bullet::ProcBomb()
case IS_C4: case IS_C4:
{ {
//c4 //c4
if (block) {
delay_time = gun_meta->i->missiles_time();
}
ProcC4Bomb(c4_target, delay_time); ProcC4Bomb(c4_target, delay_time);
} }
break; break;
@ -537,6 +540,7 @@ void Bullet::ProcC4Bomb(Car* target, int delay_time)
} }
} }
} }
task->explosion_range = GetExplosionRange();
task->gun_meta = gun_meta; task->gun_meta = gun_meta;
task->meta = meta; task->meta = meta;
task->atk = GetAtk(); task->atk = GetAtk();

1
server/gameserver/roomobstacle.cc
View File

@ -211,6 +211,7 @@ void RoomObstacle::SpecExplosion()
[this, &target_list, &bomb_pos] (Creature* c, bool& stop) [this, &target_list, &bomb_pos] (Creature* c, bool& stop)
{ {
if (master.Get()->team_id != c->team_id && if (master.Get()->team_id != c->team_id &&
!c->dead &&
bomb_pos.Distance(c->GetPos()) < meta->i->damage_dia()) { bomb_pos.Distance(c->GetPos()) < meta->i->damage_dia()) {
target_list.insert(c); target_list.insert(c);
} }