From 6060dbca1b9b505b7b4583b34ff54702dc013195 Mon Sep 17 00:00:00 2001
From: mirrorcult <lunarautomaton6@gmail.com>
Date: Mon, 28 Mar 2022 13:52:53 -0700
Subject: [PATCH] Don't use ienumerable stuff in body system (#7316)

---
 Content.Server/Body/Systems/BodySystem.cs      | 18 +++++++++++-------
 .../Body/Systems/RespiratorSystem.cs           |  6 +++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index a9d0e0be50..f7635157d7 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -47,18 +47,22 @@ namespace Content.Server.Body.Systems
         /// <param name="uid">The entity to check for the component on.</param>
         /// <param name="body">The body to check for mechanisms on.</param>
         /// <typeparam name="T">The component to check for.</typeparam>
-        public IEnumerable<(T Comp, MechanismComponent Mech)> GetComponentsOnMechanisms<T>(EntityUid uid,
+        public List<(T Comp, MechanismComponent Mech)> GetComponentsOnMechanisms<T>(EntityUid uid,
             SharedBodyComponent? body=null) where T : Component
         {
             if (!Resolve(uid, ref body))
-                yield break;
+                return new();
 
+            var query = EntityManager.GetEntityQuery<T>();
+            var list = new List<(T Comp, MechanismComponent Mech)>(3);
             foreach (var (part, _) in body.Parts)
             foreach (var mechanism in part.Mechanisms)
             {
-                if (EntityManager.TryGetComponent<T>((mechanism).Owner, out var comp))
-                    yield return (comp, mechanism);
+                if (query.TryGetComponent(mechanism.Owner, out var comp))
+                    list.Add((comp, mechanism));
             }
+
+            return list;
         }
 
         /// <summary>
@@ -71,7 +75,7 @@ namespace Content.Server.Body.Systems
         /// <typeparam name="T">The component to check for.</typeparam>
         /// <returns>Whether any were found.</returns>
         public bool TryGetComponentsOnMechanisms<T>(EntityUid uid,
-            [NotNullWhen(true)] out IEnumerable<(T Comp, MechanismComponent Mech)>? comps,
+            [NotNullWhen(true)] out List<(T Comp, MechanismComponent Mech)>? comps,
             SharedBodyComponent? body=null) where T: Component
         {
             if (!Resolve(uid, ref body))
@@ -80,9 +84,9 @@ namespace Content.Server.Body.Systems
                 return false;
             }
 
-            comps = GetComponentsOnMechanisms<T>(uid, body).ToArray();
+            comps = GetComponentsOnMechanisms<T>(uid, body);
 
-            if (!comps.Any())
+            if (comps.Count == 0)
             {
                 comps = null;
                 return false;
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 1b016dd298..17e52c7b36 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -99,7 +99,7 @@ namespace Content.Server.Body.Systems
             if (!Resolve(uid, ref body, false))
                 return;
 
-            var organs = _bodySystem.GetComponentsOnMechanisms<LungComponent>(uid, body).ToArray();
+            var organs = _bodySystem.GetComponentsOnMechanisms<LungComponent>(uid, body);
 
             // Inhale gas
             var ev = new InhaleLocationEvent();
@@ -114,8 +114,8 @@ namespace Content.Server.Body.Systems
             var ratio = (Atmospherics.BreathVolume / ev.Gas.Volume);
             var actualGas = ev.Gas.RemoveRatio(ratio);
 
-            var lungRatio = 1.0f / organs.Length;
-            var gas = organs.Length == 1 ? actualGas : actualGas.RemoveRatio(lungRatio);
+            var lungRatio = 1.0f / organs.Count;
+            var gas = organs.Count == 1 ? actualGas : actualGas.RemoveRatio(lungRatio);
             foreach (var (lung, _) in organs)
             {
                 // Merge doesn't remove gas from the giver.