Fix IsBlockedTurf throwing when entities do not have a PhysicsComponent (#8170)

2022-05-15 04:06:43 +02:00
parent af575323c1
commit 4a1b4fb18c
1 changed files with 4 additions and 1 deletions
--- 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<PhysicsComponent>(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;