Inline GetComponentOrNull

2021-12-03 15:32:05 +01:00
parent ee4ff9cfe8
commit 2654775bf0
30 changed files with 55 additions and 32 deletions
--- a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs
+++ b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs
@@ -107,7 +107,7 @@ namespace Content.Server.Light.EntitySystems

            // try get first inserted bulb of the same type as targeted light fixtutre
            var bulb = replacer.InsertedBulbs.ContainedEntities.FirstOrDefault(
-                (e) => e.GetComponentOrNull<LightBulbComponent>()?.Type == fixture.BulbType);
+                (e) => IoCManager.Resolve<IEntityManager>().GetComponentOrNull<LightBulbComponent>(e.Uid)?.Type == fixture.BulbType);

            // found bulb in inserted storage
            if (bulb != null)