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

1

Browse Source
This commit is contained in:
aozhiwei 2024-04-15 14:30:00 +08:00
parent fdd88cc7d8
commit d2369f7280
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/bullet.cc
View File

@ -139,13 +139,15 @@ void Bullet::OnHit(std::set<Entity*>& objects)
bool eat = false; bool eat = false;
if (!trace_target_id && !reporter_list) { if (!trace_target_id && !reporter_list) {
if (mt::Param::s().bullet_through_wall_check) { if (mt::Param::s().bullet_through_wall_check) {
if (!room->BulletCanReach(born_pos.ToGlmVec3(), target->GetPos().ToGlmVec3())) { if (!gun_meta->is_penetrate_thing() &&
!room->BulletCanReach(born_pos.ToGlmVec3(), target->GetPos().ToGlmVec3())) {
eat = true; eat = true;
} }
if (gun_meta->id() == 30905 && eat && sender.Get()) { if (gun_meta->id() == 30905 && eat && sender.Get()) {
glm::vec3 new_born_pos = born_pos.ToGlmVec3(); glm::vec3 new_born_pos = born_pos.ToGlmVec3();
new_born_pos.y = target->GetPos().GetY(); new_born_pos.y = target->GetPos().GetY();
if (room->BulletCanReach(new_born_pos, target->GetPos().ToGlmVec3())) { if (gun_meta->is_penetrate_thing() ||
room->BulletCanReach(new_born_pos, target->GetPos().ToGlmVec3())) {
eat = false; eat = false;
} }
} }