From 86a89005aea5ec3567a4a35bea14d87902212554 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Date: Sun, 24 Apr 2022 01:40:16 +0200
Subject: [PATCH] Makes TurfHelpers.IsBlockedTurf use the resolves pattern.
(#7720)
---
Content.Shared/Maps/TurfHelpers.cs | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs
index 56d3324b59..bc57592b85 100644
--- a/Content.Shared/Maps/TurfHelpers.cs
+++ b/Content.Shared/Maps/TurfHelpers.cs
@@ -191,9 +191,14 @@ namespace Content.Shared.Maps
///
/// Checks if a turf has something dense on it.
///
- public static bool IsBlockedTurf(this TileRef turf, bool filterMobs)
+ public static bool IsBlockedTurf(this TileRef turf, bool filterMobs, SharedPhysicsSystem? physics = null, IEntitySystemManager? entSysMan = null)
{
- var physics = EntitySystem.Get();
+ if (physics == null)
+ {
+ // Slow path, resolve dependencies.
+ IoCManager.Resolve(ref entSysMan);
+ entSysMan.Resolve(ref physics);
+ }
if (!GetWorldTileBox(turf, out var worldBox))
return false;