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-27 02:22:41 +00:00
commit 41a77c3cde
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/gameserver/bullet.cc
View File

@ -91,6 +91,8 @@ void Bullet::ProcBomb()
sender.Get()->team_id == c->team_id) { sender.Get()->team_id == c->team_id) {
return; return;
} }
AabbCollider aabb_box;
c->GetHitAabbBox(aabb_box);
if (meta->i->_inventory_slot() == IS_C4) { if (meta->i->_inventory_slot() == IS_C4) {
if (!objects.empty()) { if (!objects.empty()) {
stop = true; stop = true;
@ -99,12 +101,16 @@ void Bullet::ProcBomb()
if (!c->IsCar()) { if (!c->IsCar()) {
return; return;
} }
c4_target = c->AsCar(); if (TestCollision(room, &aabb_box)) {
} c4_target = c->AsCar();
AabbCollider aabb_box; stop = true;
c->GetHitAabbBox(aabb_box); objects.insert(c);
if (TestCollision(room, &aabb_box)) { return;
objects.insert(c); }
} else {
if (TestCollision(room, &aabb_box)) {
objects.insert(c);
}
} }
} }
}); });