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

修复障碍物碰撞问题

Browse Source
This commit is contained in:
aozhiwei 2019-08-12 11:50:59 +08:00
parent 942d16e4b6
commit f6dc39d11c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/human.cc
View File

@ -360,8 +360,13 @@ bool Human::IsCollisionInMapService()
if (!collider->owner->dead && TestCollision((ColliderComponent*)collider)) { if (!collider->owner->dead && TestCollision((ColliderComponent*)collider)) {
if (last_collision_door != collider->owner) { if (last_collision_door != collider->owner) {
Obstacle* obstacle = (Obstacle*)collider->owner; Obstacle* obstacle = (Obstacle*)collider->owner;
if (!obstacle->dead && obstacle->meta->i->attack_type() == 1 && if (!obstacle->dead &&
obstacle->meta->i->drop() != 0) { obstacle->meta->i->attack_type() == 1 &&
obstacle->meta->i->drop() != 0 &&
room->gas_data.gas_mode != GasInactive &&
!a8::HasBitFlag(status, HS_Fly) &&
!a8::HasBitFlag(status, HS_Jump)
) {
obstacle->health = 0; obstacle->health = 0;
obstacle->dead = obstacle->health <= 0.01f; obstacle->dead = obstacle->health <= 0.01f;
obstacle->dead_frameno = room->frame_no; obstacle->dead_frameno = room->frame_no;