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 16:48:50 +08:00
parent 0936d69779
commit 14f7e822d6
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/gameserver/human.cc
View File

@ -318,7 +318,30 @@ bool Human::IsCollision()
(last_collision_door == nullptr || last_collision_door != entity) && (last_collision_door == nullptr || last_collision_door != entity) &&
TestCollision(entity) TestCollision(entity)
){ ){
objects.push_back(entity); Obstacle* obstacle = (Obstacle*)entity;
if (!obstacle->dead &&
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->dead = obstacle->health <= 0.01f;
obstacle->dead_frameno = room->frame_no;
if (obstacle->dead) {
#if 0
if (obstacle->meta->i->damage_dia() > 0.01f &&
obstacle->meta->i->damage() > 0.01f) {
obstacle->Explosion(this);
}
#endif
room->ScatterDrop(obstacle->pos, obstacle->meta->i->drop());
}
obstacle->BroadcastFullState();
} else {
objects.push_back(entity);
}
} }
} }
break; break;