From 4a1b4fb18c04daa1a293424dcb4b2e1aae055ff1 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> Date: Sun, 15 May 2022 04:06:43 +0200 Subject: [PATCH] Fix IsBlockedTurf throwing when entities do not have a PhysicsComponent (#8170) --- Content.Shared/Maps/TurfHelpers.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs index a326759484..c54555735a 100644 --- a/Content.Shared/Maps/TurfHelpers.cs +++ b/Content.Shared/Maps/TurfHelpers.cs @@ -200,7 +200,10 @@ namespace Content.Shared.Maps foreach (var ent in query) { - var body = entManager.GetComponent(ent); + // Yes, this can fail. Welp! + if (!entManager.TryGetComponent(ent, out PhysicsComponent? body)) + continue; + if (body.CanCollide && body.Hard && (body.CollisionLayer & (int) CollisionGroup.Impassable) != 0) return true;