Fix disposals throwing you into the shadow realm (#1792)

2020-08-19 16:49:34 +02:00
parent dc77c399b9
commit 3b2a804f4f
2 changed files with 23 additions and 0 deletions
--- a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs
+++ b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs
@@ -122,6 +122,12 @@ namespace Content.Server.GameObjects.Components.Disposal
                return false;
            }

+            if (!entity.TryGetComponent(out ICollidableComponent collidable) ||
+                !collidable.CanCollide)
+            {
+                return false;
+            }
+
            if (!entity.HasComponent<ItemComponent>() &&
                !entity.HasComponent<IBodyManagerComponent>())
            {