From 90982d8943f0cf6f0ae41b7b9d15c1178184d66f Mon Sep 17 00:00:00 2001
From: Jackson Lewis <inquisitivepenguin@protonmail.com>
Date: Mon, 6 Jul 2020 13:00:07 -0700
Subject: [PATCH] Fix airlock collisions (#1030)

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
---
 .../GameObjects/Components/Doors/ServerDoorComponent.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
index 0c424fe17d..29076c4501 100644
--- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
+++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
@@ -154,7 +154,7 @@ namespace Content.Server.GameObjects
 
             Timer.Spawn(OpenTimeOne, async () =>
             {
-                collidableComponent.CanCollide = false;
+                collidableComponent.Hard = false;
 
                 await Timer.Delay(OpenTimeTwo, _cancellationTokenSource.Token);
 
@@ -192,14 +192,14 @@ namespace Content.Server.GameObjects
 
         public bool Close()
         {
-            if (collidableComponent.IsColliding(Vector2.Zero))
+            if (collidableComponent.IsColliding(Vector2.Zero, false))
             {
                 // Do nothing, somebody's in the door.
                 return false;
             }
 
             State = DoorState.Closing;
-            collidableComponent.CanCollide = true;
+            collidableComponent.Hard = true;
             OpenTimeCounter = 0;
             SetAppearance(DoorVisualState.Closing);