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-06-18 16:44:16 +08:00
parent 4796473090
commit 4022545a6e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/hero.cc
View File

@ -154,8 +154,8 @@ bool Hero::IsCollisionInMapService()
( (
(collider->type == CT_Aabb && aabb_box.Intersect((ColliderComponent*)collider)) || (collider->type == CT_Aabb && aabb_box.Intersect((ColliderComponent*)collider)) ||
(collider->type == CT_Circle && self_collider_->Intersect((ColliderComponent*)collider)) (collider->type == CT_Circle && self_collider_->Intersect((ColliderComponent*)collider))
) ) &&
) { !obstacle->CanThroughable(this)) {
if (last_collision_door_ != collider->owner) { if (last_collision_door_ != collider->owner) {
OptResult opt_result = kOptPass; OptResult opt_result = kOptPass;
obstacle->OnCollisionTrigger(this, opt_result); obstacle->OnCollisionTrigger(this, opt_result);

3
server/gameserver/roomobstacle.cc
View File

@ -507,6 +507,9 @@ void RoomObstacle::Die(Room* room)
bool RoomObstacle::CanThroughable(Creature* c) bool RoomObstacle::CanThroughable(Creature* c)
{ {
if (meta->i->thing_type() == kObstacleOilBucket) {
return true;
}
if (master.Get()) { if (master.Get()) {
return master.Get()->team_id == c->team_id && temp_through_; return master.Get()->team_id == c->team_id && temp_through_;
} else { } else {