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-04 07:32:51 +00:00
parent c941bd2c59
commit 88e239dc34
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/mapservice.cc
View File

@ -327,6 +327,9 @@ bool MapService::CollisionDetectionAndGetCollider(Room* room,
case ET_Obstacle:
{
Obstacle* obstacle = (Obstacle*)collider->owner;
if (obstacle->meta->i->prebattle_hide() && room->GetGasData().gas_mode == GasInactive) {
break;
}
if (obstacle->meta->i->collision_hit() != kCollisionHitPass) {
if (!obstacle->IsDead(room) && collider->IntersectEx(pos, a_collider)) {
*pickup_collider = collider;

1
server/tools/protobuild/metatable.proto
View File

@ -72,6 +72,7 @@ message MapThing
optional int32 collision_hit = 29;
optional int32 explosion_hit = 30;
optional string sweep_tags = 31;
optional int32 prebattle_hide = 32;
}
message SafeArea