From f44d7970574a509d28b6b4fa0362064c7f055580 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <gradientvera@outlook.com>
Date: Fri, 3 Dec 2021 11:42:24 +0100
Subject: [PATCH] Inline GetAllComponents

---
 Robust.Client/Console/Commands/Debug.cs                |  2 +-
 .../Instances/ViewVariablesInstanceEntity.cs           |  2 +-
 Robust.Server/Maps/MapLoader.cs                        |  2 +-
 .../ViewVariables/Traits/ViewVariablesTraitEntity.cs   |  2 +-
 Robust.Shared/GameObjects/IEntity.cs                   | 10 ----------
 Robust.Shared/GameObjects/IMapInit.cs                  |  3 ++-
 6 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Robust.Client/Console/Commands/Debug.cs b/Robust.Client/Console/Commands/Debug.cs
index fce08416c1..8d318aed3b 100644
--- a/Robust.Client/Console/Commands/Debug.cs
+++ b/Robust.Client/Console/Commands/Debug.cs
@@ -248,7 +248,7 @@ namespace Robust.Client.Console.Commands
 
             shell.WriteLine($"{entity.Uid}: {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityPrototype?.ID}/{entity.Name}");
             shell.WriteLine($"init/del/lmt: {(!IoCManager.Resolve<IEntityManager>().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLifeStage) >= EntityLifeStage.Initialized}/{(!IoCManager.Resolve<IEntityManager>().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted}/{IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLastModifiedTick}");
-            foreach (var component in entity.GetAllComponents())
+            foreach (var component in IoCManager.Resolve<IEntityManager>().GetComponents(entity.Uid))
             {
                 shell.WriteLine(component.ToString() ?? "");
                 if (component is IComponentDebug debug)
diff --git a/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs b/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs
index cdd37d1c95..7333cd639a 100644
--- a/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs
+++ b/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs
@@ -202,7 +202,7 @@ namespace Robust.Client.ViewVariables.Instances
             _clientComponentsAddButton.OnPressed += OnClientComponentsAddButtonPressed;
             _clientComponentsSearchBar.OnTextChanged += OnClientComponentsSearchBarChanged;
 
-            var componentList = _entity.GetAllComponents().OrderBy(c => c.GetType().ToString());
+            var componentList = IoCManager.Resolve<IEntityManager>().GetComponents(_entity.Uid).OrderBy(c => c.GetType().ToString());
 
             foreach (var component in componentList)
             {
diff --git a/Robust.Server/Maps/MapLoader.cs b/Robust.Server/Maps/MapLoader.cs
index 0ec78571cd..c40e1d2452 100644
--- a/Robust.Server/Maps/MapLoader.cs
+++ b/Robust.Server/Maps/MapLoader.cs
@@ -805,7 +805,7 @@ namespace Robust.Server.Maps
 
                     var components = new YamlSequenceNode();
                     // See engine#636 for why the Distinct() call.
-                    foreach (var component in entity.GetAllComponents())
+                    foreach (var component in IoCManager.Resolve<IEntityManager>().GetComponents(entity.Uid))
                     {
                         if (component is MapSaveIdComponent)
                             continue;
diff --git a/Robust.Server/ViewVariables/Traits/ViewVariablesTraitEntity.cs b/Robust.Server/ViewVariables/Traits/ViewVariablesTraitEntity.cs
index ce984112a0..a22ed8ee82 100644
--- a/Robust.Server/ViewVariables/Traits/ViewVariablesTraitEntity.cs
+++ b/Robust.Server/ViewVariables/Traits/ViewVariablesTraitEntity.cs
@@ -22,7 +22,7 @@ namespace Robust.Server.ViewVariables.Traits
             {
                 var list = new List<ViewVariablesBlobEntityComponents.Entry>();
                 // See engine#636 for why the Distinct() call.
-                foreach (var component in _entity.GetAllComponents())
+                foreach (var component in IoCManager.Resolve<IEntityManager>().GetComponents(_entity.Uid))
                 {
                     var type = component.GetType();
                     list.Add(new ViewVariablesBlobEntityComponents.Entry
diff --git a/Robust.Shared/GameObjects/IEntity.cs b/Robust.Shared/GameObjects/IEntity.cs
index c61a6382e4..a1c0dfdbd1 100644
--- a/Robust.Shared/GameObjects/IEntity.cs
+++ b/Robust.Shared/GameObjects/IEntity.cs
@@ -109,16 +109,6 @@ namespace Robust.Shared.GameObjects
             IoCManager.Resolve<IEntityManager>().DeleteEntity(Uid);
         }
 
-        public IEnumerable<IComponent> GetAllComponents()
-        {
-            return IoCManager.Resolve<IEntityManager>().GetComponents(Uid);
-        }
-
-        public IEnumerable<T> GetAllComponents<T>()
-        {
-            return IoCManager.Resolve<IEntityManager>().GetComponents<T>(Uid);
-        }
-
         #endregion Components
 
         public override string ToString()
diff --git a/Robust.Shared/GameObjects/IMapInit.cs b/Robust.Shared/GameObjects/IMapInit.cs
index 03a7af6d25..f9eb4285ce 100644
--- a/Robust.Shared/GameObjects/IMapInit.cs
+++ b/Robust.Shared/GameObjects/IMapInit.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Robust.Shared.IoC;
 using Robust.Shared.Utility;
 
@@ -30,7 +31,7 @@ namespace Robust.Shared.GameObjects
             IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLifeStage = EntityLifeStage.MapInitialized;
 
             IoCManager.Resolve<IEntityManager>().EventBus.RaiseLocalEvent(entity.Uid, MapInit, false);
-            foreach (var init in entity.GetAllComponents<IMapInit>())
+            foreach (var init in IoCManager.Resolve<IEntityManager>().GetComponents<IMapInit>(entity.Uid))
             {
                 init.MapInit();
             }