tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix airlock crush (#2348)

Browse Source 
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2020-10-21 19:22:38 +11:00
committed by GitHub
parent c7e7ff4065
commit c70066aede
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
View File

@@ -378,12 +378,17 @@ namespace Content.Server.GameObjects.Components.Doors
public bool Close() public bool Close()
{ {
bool shouldCheckCrush = false; bool shouldCheckCrush = false;
if (Owner.TryGetComponent(out IPhysicsComponent? physics))
physics.CanCollide = true;
if (_canCrush && Owner.TryGetComponent(out IPhysicsComponent? physics) && if (_canCrush && physics != null &&
physics.IsColliding(Vector2.Zero, false)) physics.IsColliding(Vector2.Zero, false))
{ {
if (Safety) if (Safety)
{
physics.CanCollide = false;
return false; return false;
}
// check if we crush someone while closing // check if we crush someone while closing
shouldCheckCrush = true; shouldCheckCrush = true;