From c40eaa52fc4996265faa9688aaee52e330f7d561 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 15 Oct 2021 14:04:23 +1100 Subject: [PATCH] Fix doors on rotated grid (#4874) --- Content.Server/Doors/Components/ServerDoorComponent.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs index 4728177716..bd827469f6 100644 --- a/Content.Server/Doors/Components/ServerDoorComponent.cs +++ b/Content.Server/Doors/Components/ServerDoorComponent.cs @@ -467,10 +467,9 @@ namespace Content.Server.Doors.Components var broadPhaseSystem = EntitySystem.Get(); // Use this version so we can ignore the CanCollide being false - foreach(var e in broadPhaseSystem.GetCollidingEntities(physicsComponent.Owner.Transform.MapID, physicsComponent.GetWorldAABB())) + foreach(var _ in broadPhaseSystem.GetCollidingEntities(physicsComponent, -0.015f)) { - if (((physicsComponent.CollisionMask & e.CollisionLayer) | (e.CollisionMask & physicsComponent.CollisionLayer)) != 0 - && broadPhaseSystem.IntersectionPercent(physicsComponent, e) > 0.01f) return true; + return true; } } return false;