From b9329d59b8da9634c00926d2fb68f9df3e52d1e2 Mon Sep 17 00:00:00 2001 From: moonheart08 Date: Fri, 8 Oct 2021 02:37:17 -0500 Subject: [PATCH] Doors no longer have murderous intent (#4799) --- Content.Server/Doors/Components/ServerDoorComponent.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs index 3f31c127d4..406895a60f 100644 --- a/Content.Server/Doors/Components/ServerDoorComponent.cs +++ b/Content.Server/Doors/Components/ServerDoorComponent.cs @@ -446,7 +446,8 @@ namespace Content.Server.Doors.Components // Use this version so we can ignore the CanCollide being false foreach(var e in broadPhaseSystem.GetCollidingEntities(physicsComponent.Owner.Transform.MapID, physicsComponent.GetWorldAABB())) { - if ((physicsComponent.CollisionMask & e.CollisionLayer) != 0 && broadPhaseSystem.IntersectionPercent(physicsComponent, e) > 0.01f) return true; + if (((physicsComponent.CollisionMask & e.CollisionLayer) | (e.CollisionMask & physicsComponent.CollisionLayer)) != 0 + && broadPhaseSystem.IntersectionPercent(physicsComponent, e) > 0.01f) return true; } } return false;