Inline GetComponent

Content.Client/AME/Visualizers/AMEControllerVisualizer.cs

@@ -1,6 +1,7 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using static Content.Shared.AME.SharedAMEControllerComponent;
 
 namespace Content.Client.AME.Visualizers
@@ -11,7 +12,7 @@ namespace Content.Client.AME.Visualizers
         public override void InitializeEntity(IEntity entity)
         {
             base.InitializeEntity(entity);
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             sprite.LayerMapSet(Layers.Display, sprite.AddLayerState("control_on"));
             sprite.LayerSetVisible(Layers.Display, false);
@@ -20,7 +21,7 @@ namespace Content.Client.AME.Visualizers
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             if (component.TryGetData<string>(AMEControllerVisuals.DisplayState, out var state))
             {
                 switch (state)

Content.Client/AME/Visualizers/AMEVisualizer.cs

@@ -1,6 +1,7 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using static Content.Shared.AME.SharedAMEShieldComponent;
 
 namespace Content.Client.AME.Visualizers
@@ -11,7 +12,7 @@ namespace Content.Client.AME.Visualizers
         public override void InitializeEntity(IEntity entity)
         {
             base.InitializeEntity(entity);
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
             sprite.LayerMapSet(Layers.Core, sprite.AddLayerState("core"));
             sprite.LayerSetVisible(Layers.Core, false);
             sprite.LayerMapSet(Layers.CoreState, sprite.AddLayerState("core_weak"));
@@ -21,7 +22,7 @@ namespace Content.Client.AME.Visualizers
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             if (component.TryGetData<string>(AMEShieldVisuals.Core, out var core))
             {
                 if (core == "isCore")

Content.Client/Animations/AnimationsTestComponent.cs

@@ -3,6 +3,7 @@ using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Animations
@@ -16,7 +17,7 @@ namespace Content.Client.Animations
         {
             base.Initialize();
 
-            var animations = Owner.GetComponent<AnimationPlayerComponent>();
+            var animations = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(Owner.Uid);
             animations.Play(new Animation
             {
                 Length = TimeSpan.FromSeconds(20),

Content.Client/Animations/ReusableAnimations.cs

@@ -22,10 +22,10 @@ namespace Content.Client.Animations
                 Logger.Error("Entity ({0}) couldn't be animated for pickup since it doesn't have a {1}!", entity.Name, nameof(SpriteComponent));
                 return;
             }
-            var sprite = animatableClone.GetComponent<SpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(animatableClone.Uid);
             sprite.CopyFrom(sprite0);
 
-            var animations = animatableClone.GetComponent<AnimationPlayerComponent>();
+            var animations = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(animatableClone.Uid);
             animations.AnimationCompleted += (_) => {
                 IoCManager.Resolve<IEntityManager>().DeleteEntity(animatableClone.Uid);
             };

Content.Client/Atmos/Visualizers/FireVisualizer.cs

@@ -3,6 +3,7 @@ using Content.Shared.Atmos.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Atmos.Visualizers
@@ -26,7 +27,7 @@ namespace Content.Client.Atmos.Visualizers
         {
             base.InitializeEntity(entity);
 
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             sprite.LayerMapReserveBlank(FireVisualLayers.Fire);
             sprite.LayerSetVisible(FireVisualLayers.Fire, false);
@@ -49,7 +50,7 @@ namespace Content.Client.Atmos.Visualizers
 
         private void SetOnFire(AppearanceComponent component, bool onFire, float fireStacks)
         {
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             if (_sprite != null)
             {

Content.Client/Atmos/Visualizers/GasCanisterVisualizer.cs

@@ -2,6 +2,7 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Atmos.Visualizers
@@ -19,7 +20,7 @@ namespace Content.Client.Atmos.Visualizers
         {
             base.InitializeEntity(entity);
 
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             sprite.LayerMapSet(Layers.PressureLight, sprite.AddLayerState(_statePressure[0]));
             sprite.LayerSetShader(Layers.PressureLight, "unshaded");

Content.Client/Atmos/Visualizers/GasPortableVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.Atmos.Piping.Unary.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Atmos.Visualizers
@@ -16,7 +17,7 @@ namespace Content.Client.Atmos.Visualizers
         {
             base.InitializeEntity(entity);
 
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             if (_stateConnected != null)
             {

Content.Client/Botany/PlantHolderVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.Botany;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Botany
@@ -13,7 +14,7 @@ namespace Content.Client.Botany
         {
             base.InitializeEntity(entity);
 
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             sprite.LayerMapReserveBlank(PlantHolderLayers.Plant);
             sprite.LayerMapReserveBlank(PlantHolderLayers.HealthLight);
@@ -55,7 +56,7 @@ namespace Content.Client.Botany
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             if (component.TryGetData<SpriteSpecifier>(PlantHolderVisuals.Plant, out var specifier))
             {

Content.Client/Buckle/BuckleVisualizer.cs

@@ -5,6 +5,7 @@ using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Buckle
@@ -30,7 +31,7 @@ namespace Content.Client.Buckle
 
         private void SetRotation(AppearanceComponent component, Angle rotation)
         {
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             if (!sprite.Owner.TryGetComponent(out AnimationPlayerComponent? animation))
             {

Content.Client/Chemistry/Visualizers/VaporVisualizer.cs

@@ -4,6 +4,7 @@ using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -53,7 +54,7 @@ namespace Content.Client.Chemistry.Visualizers
         {
             if (!state) return;
 
-            var animPlayer = component.Owner.GetComponent<AnimationPlayerComponent>();
+            var animPlayer = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(component.Owner.Uid);
 
             if(!animPlayer.HasRunningAnimation(AnimationKey))
                 animPlayer.Play(VaporFlick, AnimationKey);
@@ -61,7 +62,7 @@ namespace Content.Client.Chemistry.Visualizers
 
         private void SetColor(AppearanceComponent component, Color color)
         {
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             sprite.Color = color;
         }

Content.Client/Computer/ComputerVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.Computer;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Computer
@@ -23,7 +24,7 @@ namespace Content.Client.Computer
         {
             base.InitializeEntity(entity);
 
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
             sprite.LayerSetState(Layers.Screen, ScreenState);
 
             if (!string.IsNullOrEmpty(KeyboardState))
@@ -37,7 +38,7 @@ namespace Content.Client.Computer
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             if (!component.TryGetData(ComputerVisuals.Powered, out bool powered))
             {

Content.Client/Construction/ConstructionSystem.cs

@@ -171,12 +171,12 @@ namespace Content.Client.Construction
             }
 
             var ghost = EntityManager.SpawnEntity("constructionghost", loc);
-            var comp = ghost.GetComponent<ConstructionGhostComponent>();
+            var comp = IoCManager.Resolve<IEntityManager>().GetComponent<ConstructionGhostComponent>(ghost.Uid);
             comp.Prototype = prototype;
             comp.GhostId = _nextId++;
             ghost.Transform.LocalRotation = dir.ToAngle();
             _ghosts.Add(comp.GhostId, comp);
-            var sprite = ghost.GetComponent<SpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(ghost.Uid);
             sprite.Color = new Color(48, 255, 48, 128);
             sprite.AddBlankLayer(0); // There is no way to actually check if this already exists, so we blindly insert a new one
             sprite.LayerSetSprite(0, prototype.Icon);

Content.Client/Construction/MachineFrameVisualizer.cs

@@ -2,6 +2,7 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Client.Construction
 {
@@ -14,7 +15,7 @@ namespace Content.Client.Construction
 
             if (component.TryGetData<int>(MachineFrameVisuals.State, out var data))
             {
-                var sprite = component.Owner.GetComponent<ISpriteComponent>();
+                var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
                 sprite.LayerSetState(0, $"box_{data}");
             }

Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs

@@ -57,7 +57,7 @@ namespace Content.Client.ContextMenu.UI
                 e =>
                 {
                     var hash = 0;
-                    foreach (var element in e.GetComponent<ISpriteComponent>().AllLayers.Where(obj => obj.Visible).Select(s => s.RsiState.Name))
+                    foreach (var element in IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(e.Uid).AllLayers.Where(obj => obj.Visible).Select(s => s.RsiState.Name))
                     {
                         hash ^= EqualityComparer<string>.Default.GetHashCode(element!);
                     }

Content.Client/Crayon/CrayonDecalVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.Crayon;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Crayon
@@ -13,7 +14,7 @@ namespace Content.Client.Crayon
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<SpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner.Uid);
 
             if (component.TryGetData(CrayonVisuals.State, out string state))
             {

Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs

@@ -4,6 +4,7 @@ using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using static Content.Shared.Disposal.Components.SharedDisposalUnitComponent;
@@ -88,7 +89,7 @@ namespace Content.Client.Disposal.Visualizers
                 case VisualState.Flushing:
                     sprite.LayerSetState(DisposalUnitVisualLayers.Base, _stateAnchored);
 
-                    var animPlayer = appearance.Owner.GetComponent<AnimationPlayerComponent>();
+                    var animPlayer = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(appearance.Owner.Uid);
 
                     if (!animPlayer.HasRunningAnimation(AnimationKey))
                     {

Content.Client/Doors/AirlockVisualizer.cs

@@ -122,8 +122,8 @@ namespace Content.Client.Doors
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
-            var animPlayer = component.Owner.GetComponent<AnimationPlayerComponent>();
+            var animPlayer = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(component.Owner.Uid);
             if (!component.TryGetData(DoorVisuals.VisualState, out DoorVisualState state))
             {
                 state = DoorVisualState.Closed;

Content.Client/DragDrop/DragDropSystem.cs

@@ -188,7 +188,7 @@ namespace Content.Client.DragDrop
                 // pop up drag shadow under mouse
                 var mousePos = _eyeManager.ScreenToMap(_dragDropHelper.MouseScreenPosition);
                 _dragShadow = EntityManager.SpawnEntity("dragshadow", mousePos);
-                var dragSprite = _dragShadow.GetComponent<SpriteComponent>();
+                var dragSprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(_dragShadow.Uid);
                 dragSprite.CopyFrom(draggedSprite);
                 dragSprite.RenderOrder = EntityManager.CurrentTick.Value;
                 dragSprite.Color = dragSprite.Color.WithAlpha(0.7f);

Content.Client/Extinguisher/FireExtinguisherVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.Extinguisher;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Extinguisher
@@ -26,7 +27,7 @@ namespace Content.Client.Extinguisher
 
         private void SetSafety(AppearanceComponent component, bool safety)
         {
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             sprite.LayerSetState(FireExtinguisherVisualLayers.Base, safety ? _safetyOnState : _safetyOffState);
         }

Content.Client/Gravity/GravityGeneratorVisualizer.cs

@@ -4,6 +4,7 @@ using Content.Shared.Gravity;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
@@ -52,7 +53,7 @@ namespace Content.Client.Gravity
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<SpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner.Uid);
 
             if (component.TryGetData(GravityGeneratorVisuals.State, out GravityGeneratorStatus state))
             {

Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs

@@ -7,6 +7,7 @@ using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
@@ -33,7 +34,7 @@ namespace Content.Client.Gravity.UI
             OnButton.OnPressed += _ => _owner.SetPowerSwitch(true);
             OffButton.OnPressed += _ => _owner.SetPowerSwitch(false);
 
-            EntityView.Sprite = component.Owner.GetComponent<SpriteComponent>();
+            EntityView.Sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner.Uid);
         }
 
         public void UpdateState(SharedGravityGeneratorComponent.GeneratorState state)

Content.Client/IconSmoothing/IconSmoothComponent.cs

@@ -63,7 +63,7 @@ namespace Content.Client.IconSmoothing
         {
             base.Initialize();
 
-            Sprite = Owner.GetComponent<ISpriteComponent>();
+            Sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(Owner.Uid);
         }
 
         /// <inheritdoc />

Content.Client/Items/Managers/ItemSlotManager.cs

@@ -139,8 +139,8 @@ namespace Content.Client.Items.Managers
 
             // Set green / red overlay at 50% transparency
             var hoverEntity = _entityManager.SpawnEntity("hoverentity", MapCoordinates.Nullspace);
-            var hoverSprite = hoverEntity.GetComponent<SpriteComponent>();
+            var hoverSprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(hoverEntity.Uid);
-            hoverSprite.CopyFrom(entity.GetComponent<SpriteComponent>());
+            hoverSprite.CopyFrom(IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity.Uid));
             hoverSprite.Color = fits ? new Color(0, 255, 0, 127) : new Color(255, 0, 0, 127);
 
             button.HoverSpriteView.Sprite = hoverSprite;

Content.Client/Kitchen/UI/GrinderMenu.xaml.cs

@@ -8,6 +8,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
@@ -98,7 +99,7 @@ namespace Content.Client.Kitchen.UI
                 {
                     return;
                 }
-                var texture = entity.GetComponent<SpriteComponent>().Icon?.Default;
+                var texture = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity.Uid).Icon?.Default;
 
                 var solidItem = ChamberContentBox.BoxContents.AddItem(entity.Name, texture);
                 var solidIndex = ChamberContentBox.BoxContents.IndexOf(solidItem);

Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs

@@ -5,6 +5,7 @@ using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Log;
 
 namespace Content.Client.Kitchen.Visualizers
@@ -15,7 +16,7 @@ namespace Content.Client.Kitchen.Visualizers
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             var microwaveComponent = component.Owner.GetComponentOrNull<MicrowaveComponent>();
 

Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs

@@ -1,5 +1,6 @@
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using static Content.Shared.Kitchen.Components.SharedReagentGrinderComponent;
 
 namespace Content.Client.Kitchen.Visualizers
@@ -9,7 +10,7 @@ namespace Content.Client.Kitchen.Visualizers
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             component.TryGetData(ReagentGrinderVisualState.BeakerAttached, out bool hasBeaker);
             sprite.LayerSetState(0, $"juicer{(hasBeaker ? "1" : "0")}");
         }

Content.Client/Lathe/Visualizers/AutolatheVisualizer.cs

@@ -60,8 +60,8 @@ namespace Content.Client.Lathe.Visualizers
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
-            var animPlayer = component.Owner.GetComponent<AnimationPlayerComponent>();
+            var animPlayer = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(component.Owner.Uid);
             if (!component.TryGetData(PowerDeviceVisuals.VisualState, out LatheVisualState state))
             {
                 state = LatheVisualState.Idle;

Content.Client/Lathe/Visualizers/ProtolatheVisualizer.cs

@@ -60,8 +60,8 @@ namespace Content.Client.Lathe.Visualizers
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
-            var animPlayer = component.Owner.GetComponent<AnimationPlayerComponent>();
+            var animPlayer = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(component.Owner.Uid);
             if (!component.TryGetData(PowerDeviceVisuals.VisualState, out LatheVisualState state))
             {
                 state = LatheVisualState.Idle;

Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs

@@ -106,7 +106,7 @@ namespace Content.Client.Lobby.UI
         {
             return new()
             {
-                Sprite = entity.GetComponent<ISpriteComponent>(),
+                Sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid),
                 OverrideDirection = direction,
                 Scale = (2, 2)
             };
@@ -140,7 +140,7 @@ namespace Content.Client.Lobby.UI
         {
             var protoMan = IoCManager.Resolve<IPrototypeManager>();
 
-            var inventory = dummy.GetComponent<ClientInventoryComponent>();
+            var inventory = IoCManager.Resolve<IEntityManager>().GetComponent<ClientInventoryComponent>(dummy.Uid);
 
             var highPriorityJob = profile.JobPriorities.FirstOrDefault(p => p.Value == JobPriority.High).Key;
 

Content.Client/MedicalScanner/MedicalScannerVisualizer.cs

@@ -2,6 +2,7 @@ using System;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent;
 using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent.MedicalScannerStatus;
 
@@ -14,7 +15,7 @@ namespace Content.Client.MedicalScanner
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             if (!component.TryGetData(MedicalScannerVisuals.Status, out MedicalScannerStatus status)) return;
             sprite.LayerSetState(MedicalScannerVisualLayers.Machine, StatusToMachineStateId(status));
             sprite.LayerSetState(MedicalScannerVisualLayers.Terminal, StatusToTerminalStateId(status));

Content.Client/MobState/DamageStateVisualizer.cs

@@ -3,6 +3,7 @@ using Content.Shared.MobState;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
@@ -51,7 +52,7 @@ namespace Content.Client.MobState
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             if (!component.TryGetData(DamageStateVisuals.State, out DamageState data))
             {
                 return;

Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs

@@ -2,6 +2,7 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Nutrition.Visualizers
@@ -16,7 +17,7 @@ namespace Content.Client.Nutrition.Visualizers
         {
             base.InitializeEntity(entity);
 
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             sprite.LayerMapReserveBlank(CreamPiedVisualLayers.Pie);
             sprite.LayerSetRSI(CreamPiedVisualLayers.Pie, "Effects/creampie.rsi");
@@ -35,7 +36,7 @@ namespace Content.Client.Nutrition.Visualizers
 
         private void SetPied(AppearanceComponent component, bool pied)
         {
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             sprite.LayerSetVisible(CreamPiedVisualLayers.Pie, pied);
             sprite.LayerSetState(CreamPiedVisualLayers.Pie, _state);

Content.Client/PDA/PDAVisualizer.cs

@@ -3,6 +3,7 @@ using Content.Shared.PDA;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.PDA
@@ -27,7 +28,7 @@ namespace Content.Client.PDA
         public override void InitializeEntity(IEntity entity)
         {
             base.InitializeEntity(entity);
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             if (_state != null)
             {
@@ -45,7 +46,7 @@ namespace Content.Client.PDA
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             sprite.LayerSetVisible(PDAVisualLayers.Flashlight, false);
             if (component.TryGetData(UnpoweredFlashlightVisuals.LightOn, out bool isFlashlightOn))
             {

Content.Client/Pointing/RoguePointingArrowVisualizer.cs

@@ -5,6 +5,7 @@ using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Pointing
@@ -24,7 +25,7 @@ namespace Content.Client.Pointing
 
         private void SetRotation(AppearanceComponent component, Angle rotation)
         {
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             if (!sprite.Owner.TryGetComponent(out AnimationPlayerComponent? animation))
             {

Content.Client/Power/APC/ApcVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.APC;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Client.Power.APC
 {
@@ -12,7 +13,7 @@ namespace Content.Client.Power.APC
         {
             base.InitializeEntity(entity);
 
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             sprite.LayerMapSet(Layers.ChargeState, sprite.AddLayerState("apco3-0"));
             sprite.LayerSetShader(Layers.ChargeState, "unshaded");
@@ -34,7 +35,7 @@ namespace Content.Client.Power.APC
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             if (component.TryGetData<ApcChargeState>(ApcVisuals.ChargeState, out var state))
             {
                 switch (state)

Content.Client/Power/SMES/SmesVisualizer.cs

@@ -3,6 +3,7 @@ using Content.Shared.SMES;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Client.Power.SMES
 {
@@ -13,7 +14,7 @@ namespace Content.Client.Power.SMES
         {
             base.InitializeEntity(entity);
 
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             sprite.LayerMapSet(Layers.Input, sprite.AddLayerState("smes-oc0"));
             sprite.LayerSetShader(Layers.Input, "unshaded");
@@ -28,7 +29,7 @@ namespace Content.Client.Power.SMES
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             if (!component.TryGetData<int>(SmesVisuals.LastChargeLevel, out var level) || level == 0)
             {
                 sprite.LayerSetVisible(Layers.Charge, false);

Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Client.Power
 {
@@ -12,7 +13,7 @@ namespace Content.Client.Power
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             var powered = component.TryGetData(PowerDeviceVisuals.Powered, out bool poweredVar) && poweredVar;
             sprite.LayerSetVisible(PowerDeviceVisualLayers.Powered, powered);
         }

Content.Client/PowerCell/PowerCellVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.PowerCell;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.PowerCell
@@ -16,7 +17,7 @@ namespace Content.Client.PowerCell
         {
             base.InitializeEntity(entity);
 
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             if (_prefix != null)
             {
@@ -29,7 +30,7 @@ namespace Content.Client.PowerCell
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             if (component.TryGetData(PowerCellVisuals.ChargeLevel, out byte level))
             {
                 var adjustedLevel = level * 25;

Content.Client/PowerCell/PowerChargerVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Client.PowerCell
 {
@@ -12,7 +13,7 @@ namespace Content.Client.PowerCell
         {
             base.InitializeEntity(entity);
 
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             // Base item
             sprite.LayerMapSet(Layers.Base, sprite.AddLayerState("empty"));
@@ -26,7 +27,7 @@ namespace Content.Client.PowerCell
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             // Update base item
             if (component.TryGetData(CellVisual.Occupied, out bool occupied))

Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs

@@ -165,7 +165,7 @@ namespace Content.Client.Preferences.UI
 
                 var view = new SpriteView
                 {
-                    Sprite = _previewDummy.GetComponent<SpriteComponent>(),
+                    Sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(_previewDummy.Uid),
                     Scale = (2, 2),
                     OverrideDirection = Direction.South
                 };

Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

@@ -438,7 +438,7 @@ namespace Content.Client.Preferences.UI
             #region Preview
 
             _previewDummy = entityManager.SpawnEntity("MobHumanDummy", MapCoordinates.Nullspace);
-            var sprite = _previewDummy.GetComponent<SpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(_previewDummy.Uid);
 
             // Front
             _previewSprite = new SpriteView

Content.Client/Rotation/RotationVisualizer.cs

@@ -5,6 +5,7 @@ using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Rotation
@@ -32,7 +33,7 @@ namespace Content.Client.Rotation
 
         private void SetRotation(AppearanceComponent component, Angle rotation)
         {
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             if (!sprite.Owner.TryGetComponent(out AnimationPlayerComponent? animation))
             {

Content.Client/Trigger/TimerTriggerVisualizer.cs

@@ -46,8 +46,8 @@ namespace Content.Client.Trigger
 
         public override void OnChangeData(AppearanceComponent component)
         {
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
-            var animPlayer = component.Owner.GetComponent<AnimationPlayerComponent>();
+            var animPlayer = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(component.Owner.Uid);
             if (!component.TryGetData(TriggerVisuals.VisualState, out TriggerVisualState state))
             {
                 state = TriggerVisualState.Unprimed;

Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs

@@ -141,8 +141,8 @@ namespace Content.Client.VendingMachines.UI
         {
             base.OnChangeData(component);
 
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
-            var animPlayer = component.Owner.GetComponent<AnimationPlayerComponent>();
+            var animPlayer = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(component.Owner.Uid);
             if (!component.TryGetData(VendingMachineVisuals.VisualState, out VendingMachineVisualState state))
             {
                 state = VendingMachineVisualState.Normal;

Content.Client/Wall/Components/LowWallComponent.cs

@@ -46,7 +46,7 @@ namespace Content.Client.Wall.Components
             _overlayEntity.Transform.AttachParent(Owner);
             _overlayEntity.Transform.LocalPosition = Vector2.Zero;
 
-            _overlaySprite = _overlayEntity.GetComponent<ISpriteComponent>();
+            _overlaySprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(_overlayEntity.Uid);
 
             var overState0 = $"{StateBase}over_0";
             _overlaySprite.LayerMapSet(OverCornerLayers.SE, _overlaySprite.AddLayerState(overState0));

Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs

@@ -22,7 +22,7 @@ namespace Content.Client.Weapons.Melee.Components
         {
             base.Initialize();
 
-            _sprite = Owner.GetComponent<SpriteComponent>();
+            _sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(Owner.Uid);
         }
 
         public void SetData(MeleeWeaponAnimationPrototype prototype, Angle baseAngle, IEntity attacker, bool followAttacker = true)

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -59,7 +59,7 @@ namespace Content.Client.Weapons.Melee
                 var entity = EntityManager.SpawnEntity(weaponArc.Prototype, attacker.Transform.Coordinates);
                 entity.Transform.LocalRotation = msg.Angle;
 
-                var weaponArcAnimation = entity.GetComponent<MeleeWeaponArcAnimationComponent>();
+                var weaponArcAnimation = IoCManager.Resolve<IEntityManager>().GetComponent<MeleeWeaponArcAnimationComponent>(entity.Uid);
                 weaponArcAnimation.SetData(weaponArc, msg.Angle, attacker, msg.ArcFollowAttacker);
 
                 // Due to ISpriteComponent limitations, weapons that don't use an RSI won't have this effect.

Content.Client/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.Weapons.Ranged.Barrels.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
 {
@@ -11,14 +12,14 @@ namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
         public override void InitializeEntity(IEntity entity)
         {
             base.InitializeEntity(entity);
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
             sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, "bolt-open");
         }
 
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             if (!component.TryGetData(BarrelBoltVisuals.BoltOpen, out bool boltOpen))
             {

Content.Client/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs

@@ -3,6 +3,7 @@ using Content.Shared.Weapons.Ranged.Barrels.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
@@ -21,7 +22,7 @@ namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
         public override void InitializeEntity(IEntity entity)
         {
             base.InitializeEntity(entity);
-            var sprite = entity.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
 
             if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.Mag, out _))
             {
@@ -44,7 +45,7 @@ namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
             // 1.If no mag then hide it OR
             // 2. If step 0 isn't visible then hide it (mag or unshaded)
             // 3. Otherwise just do mag / unshaded as is
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             component.TryGetData(MagazineBarrelVisuals.MagLoaded, out _magLoaded);
 

Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs

@@ -2,6 +2,7 @@ using Content.Shared.Weapons.Ranged.Barrels.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
 {
@@ -11,7 +12,7 @@ namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
             if (!component.TryGetData(AmmoVisuals.Spent, out bool spent))
             {

Content.Client/Wires/Visualizers/WiresVisualizer.cs

@@ -1,5 +1,6 @@
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using static Content.Shared.Wires.SharedWiresComponent;
 
 namespace Content.Client.Wires.Visualizers
@@ -9,7 +10,7 @@ namespace Content.Client.Wires.Visualizers
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
-            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
             if (component.TryGetData<bool>(WiresVisuals.MaintenancePanelState, out var state))
             {
                 sprite.LayerSetVisible(WiresVisualLayers.MaintenancePanel, state);

Content.IntegrationTests/Tests/ClickableTest.cs

@@ -7,6 +7,7 @@ using NUnit.Framework;
 using Robust.Server.GameObjects;
 using Robust.Shared;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
@@ -80,7 +81,7 @@ namespace Content.IntegrationTests.Tests
 
                 var ent = serverEntManager.SpawnEntity(prototype, new EntityCoordinates(gridEnt, 0f, 0f));
                 ent.Transform.LocalRotation = angle;
-                ent.GetComponent<SpriteComponent>().Scale = (scale, scale);
+                IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(ent.Uid).Scale = (scale, scale);
                 entity = ent.Uid;
             });
 
@@ -92,7 +93,7 @@ namespace Content.IntegrationTests.Tests
             await _client.WaitPost(() =>
             {
                 var ent = clientEntManager.GetEntity(entity);
-                var clickable = ent.GetComponent<ClickableComponent>();
+                var clickable = IoCManager.Resolve<IEntityManager>().GetComponent<ClickableComponent>(ent.Uid);
 
                 hit = clickable.CheckClick((clickPosX, clickPosY) + worldPos!.Value, out _, out _);
             });

Content.IntegrationTests/Tests/ContainerOcclusionTest.cs

@@ -83,7 +83,7 @@ namespace Content.IntegrationTests.Tests
                 var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
                 dummyUid = dummy.Uid;
 
-                container.GetComponent<EntityStorageComponent>().Insert(dummy);
+                IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(container.Uid).Insert(dummy);
             });
 
             await RunTicksSync(c, s, 5);
@@ -91,8 +91,8 @@ namespace Content.IntegrationTests.Tests
             c.Assert(() =>
             {
                 var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
-                var sprite = dummy.GetComponent<SpriteComponent>();
+                var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(dummy.Uid);
-                var light = dummy.GetComponent<PointLightComponent>();
+                var light = IoCManager.Resolve<IEntityManager>().GetComponent<PointLightComponent>(dummy.Uid);
                 Assert.True(sprite.ContainerOccluded);
                 Assert.True(light.ContainerOccluded);
             });
@@ -114,7 +114,7 @@ namespace Content.IntegrationTests.Tests
                 var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
                 dummyUid = dummy.Uid;
 
-                container.GetComponent<EntityStorageComponent>().Insert(dummy);
+                IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(container.Uid).Insert(dummy);
             });
 
             await RunTicksSync(c, s, 5);
@@ -122,8 +122,8 @@ namespace Content.IntegrationTests.Tests
             c.Assert(() =>
             {
                 var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
-                var sprite = dummy.GetComponent<SpriteComponent>();
+                var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(dummy.Uid);
-                var light = dummy.GetComponent<PointLightComponent>();
+                var light = IoCManager.Resolve<IEntityManager>().GetComponent<PointLightComponent>(dummy.Uid);
                 Assert.False(sprite.ContainerOccluded);
                 Assert.False(light.ContainerOccluded);
             });
@@ -146,8 +146,8 @@ namespace Content.IntegrationTests.Tests
                 var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
                 dummyUid = dummy.Uid;
 
-                containerA.GetComponent<EntityStorageComponent>().Insert(containerB);
+                IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(containerA.Uid).Insert(containerB);
-                containerB.GetComponent<EntityStorageComponent>().Insert(dummy);
+                IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(containerB.Uid).Insert(dummy);
             });
 
             await RunTicksSync(c, s, 5);
@@ -155,8 +155,8 @@ namespace Content.IntegrationTests.Tests
             c.Assert(() =>
             {
                 var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
-                var sprite = dummy.GetComponent<SpriteComponent>();
+                var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(dummy.Uid);
-                var light = dummy.GetComponent<PointLightComponent>();
+                var light = IoCManager.Resolve<IEntityManager>().GetComponent<PointLightComponent>(dummy.Uid);
                 Assert.True(sprite.ContainerOccluded);
                 Assert.True(light.ContainerOccluded);
             });

Content.IntegrationTests/Tests/Damageable/DamageableTest.cs

@@ -5,6 +5,7 @@ using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
@@ -118,7 +119,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 sMapManager.CreateMap(mapId);
 
                 sDamageableEntity = sEntityManager.SpawnEntity("TestDamageableEntityId", coordinates);
-                sDamageableComponent = sDamageableEntity.GetComponent<DamageableComponent>();
+                sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDamageableEntity.Uid);
                 sDamageableSystem = sEntitySystemManager.GetEntitySystem<DamageableSystem>();
 
                 group1 = sPrototypeManager.Index<DamageGroupPrototype>("TestGroup1");

Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs

@@ -5,6 +5,7 @@ using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;
@@ -42,7 +43,7 @@ namespace Content.IntegrationTests.Tests.Destructible
                 var coordinates = new EntityCoordinates(gridId, 0, 0);
 
                 sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleDamageGroupEntityId, coordinates);
-                sDamageableComponent = sDestructibleEntity.GetComponent<DamageableComponent>();
+                sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDestructibleEntity.Uid);
 
                 sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem<TestDestructibleListenerSystem>();
                 sTestThresholdListenerSystem.ThresholdsReached.Clear();

Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs

@@ -41,7 +41,7 @@ namespace Content.IntegrationTests.Tests.Destructible
                 var coordinates = new EntityCoordinates(gridId, 0, 0);
 
                 sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleDamageTypeEntityId, coordinates);
-                sDamageableComponent = sDestructibleEntity.GetComponent<DamageableComponent>();
+                sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDestructibleEntity.Uid);
                 sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem<TestDestructibleListenerSystem>();
                 sDamageableSystem = sEntitySystemManager.GetEntitySystem<DamageableSystem>();
             });

Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs

@@ -40,7 +40,7 @@ namespace Content.IntegrationTests.Tests.Destructible
                 var coordinates = new EntityCoordinates(gridId, 0, 0);
 
                 sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleDestructionEntityId, coordinates);
-                sDamageableComponent = sDestructibleEntity.GetComponent<DamageableComponent>();
+                sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDestructibleEntity.Uid);
                 sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem<TestDestructibleListenerSystem>();
             });
 

Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs

@@ -9,6 +9,7 @@ using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;
@@ -47,8 +48,8 @@ namespace Content.IntegrationTests.Tests.Destructible
                 var coordinates = new EntityCoordinates(gridId, 0, 0);
 
                 sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleEntityId, coordinates);
-                sDamageableComponent = sDestructibleEntity.GetComponent<DamageableComponent>();
+                sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDestructibleEntity.Uid);
-                sDestructibleComponent = sDestructibleEntity.GetComponent<DestructibleComponent>();
+                sDestructibleComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DestructibleComponent>(sDestructibleEntity.Uid);
 
                 sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem<TestDestructibleListenerSystem>();
                 sTestThresholdListenerSystem.ThresholdsReached.Clear();

Content.IntegrationTests/Tests/Doors/AirlockTest.cs

@@ -151,7 +151,7 @@ namespace Content.IntegrationTests.Tests.Doors
             for (var i = 0; i < 240; i += 10)
             {
                 // Keep the airlock awake so they collide
-                server.Post(() => airlock.GetComponent<IPhysBody>().WakeBody());
+                server.Post(() => IoCManager.Resolve<IEntityManager>().GetComponent<IPhysBody>(airlock.Uid).WakeBody());
 
                 await server.WaitRunTicks(10);
                 await server.WaitIdleAsync();

Content.IntegrationTests/Tests/Fluids/PuddleTest.cs

@@ -132,7 +132,7 @@ namespace Content.IntegrationTests.Tests.Fluids
                 // Check that the puddle was created
                 Assert.NotNull(puddle);
 
-                evaporation = puddle.Owner.GetComponent<EvaporationComponent>();
+                evaporation = IoCManager.Resolve<IEntityManager>().GetComponent<EvaporationComponent>(puddle.Owner.Uid);
 
                 IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(puddle.Owner.Uid).EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1445
 

Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs

@@ -15,6 +15,7 @@ using Robust.Client.UserInterface;
 using Robust.Server.Player;
 using Robust.Shared;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -71,7 +72,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             await server.WaitAssertion(() =>
             {
                 var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
-                var actionsComponent = playerEnt!.GetComponent<ServerActionsComponent>();
+                var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerActionsComponent>(playerEnt!.Uid);
 
                 // player should begin with their innate actions granted
                 innateActions.AddRange(actionsComponent.InnateActions);
@@ -98,7 +99,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             {
                 var local = clientPlayerMgr.LocalPlayer;
                 var controlled = local!.ControlledEntity;
-                var actionsComponent = controlled!.GetComponent<ClientActionsComponent>();
+                var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientActionsComponent>(controlled!.Uid);
 
                 // we should have our innate actions and debug1.
                 foreach (var innateAction in innateActions)
@@ -153,7 +154,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             await server.WaitAssertion(() =>
             {
                 var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
-                var actionsComponent = playerEnt!.GetComponent<ServerActionsComponent>();
+                var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerActionsComponent>(playerEnt!.Uid);
                 actionsComponent.Revoke(ActionType.DebugInstant);
             });
 
@@ -164,7 +165,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             {
                 var local = clientPlayerMgr.LocalPlayer;
                 var controlled = local!.ControlledEntity;
-                var actionsComponent = controlled!.GetComponent<ClientActionsComponent>();
+                var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientActionsComponent>(controlled!.Uid);
 
                 // we should have our innate actions, but debug1 should be revoked
                 foreach (var innateAction in innateActions)
@@ -245,7 +246,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             await server.WaitAssertion(() =>
             {
                 serverPlayerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
-                serverActionsComponent = serverPlayerEnt!.GetComponent<ServerActionsComponent>();
+                serverActionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerActionsComponent>(serverPlayerEnt!.Uid);
 
                 // spawn and give them an item that has actions
                 serverFlashlight = serverEntManager.SpawnEntity("TestFlashlight",
@@ -259,7 +260,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
 
                 // grant an extra item action, before pickup, initially disabled
                 itemActions.GrantOrUpdate(ItemActionType.DebugToggle, false);
-                serverPlayerEnt.GetComponent<HandsComponent>().PutInHand(serverFlashlight.GetComponent<ItemComponent>(), false);
+                IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(serverPlayerEnt.Uid).PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(serverFlashlight.Uid), false);
                 // grant an extra item action, after pickup, with a cooldown
                 itemActions.GrantOrUpdate(ItemActionType.DebugInstant, cooldown: cooldown);
 
@@ -285,7 +286,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             {
                 var local = clientPlayerMgr.LocalPlayer;
                 var controlled = local!.ControlledEntity;
-                clientActionsComponent = controlled!.GetComponent<ClientActionsComponent>();
+                clientActionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientActionsComponent>(controlled!.Uid);
 
                 var lightEntry = clientActionsComponent.ItemActionStates()
                     .Where(entry => entry.Value.ContainsKey(ItemActionType.ToggleLight))
@@ -333,7 +334,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             await server.WaitAssertion(() =>
             {
                 // drop the item, and the item actions should go away
-                serverPlayerEnt.GetComponent<HandsComponent>()
+                IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(serverPlayerEnt.Uid)
                     .TryDropEntity(serverFlashlight, serverPlayerEnt.Transform.Coordinates, false);
                 Assert.That(serverActionsComponent.ItemActionStates().ContainsKey(serverFlashlight.Uid), Is.False);
             });
@@ -351,7 +352,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             {
                 // pick the item up again, the states should be back to what they were when dropped,
                 // as the states "stick" with the item
-                serverPlayerEnt.GetComponent<HandsComponent>().PutInHand(serverFlashlight.GetComponent<ItemComponent>(), false);
+                IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(serverPlayerEnt.Uid).PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(serverFlashlight.Uid), false);
                 Assert.That(serverActionsComponent.ItemActionStates().TryGetValue(serverFlashlight.Uid, out var lightStates));
                 Assert.That(lightStates.TryGetValue(ItemActionType.ToggleLight, out var lightState));
                 Assert.That(lightState.Equals(new ActionState(true, toggledOn: true)));

Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs

@@ -7,6 +7,8 @@ using Content.Shared.Alert;
 using NUnit.Framework;
 using Robust.Client.UserInterface;
 using Robust.Server.Player;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
 {
@@ -29,7 +31,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             {
                 var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
                 Assert.NotNull(playerEnt);
-                var alertsComponent = playerEnt.GetComponent<ServerAlertsComponent>();
+                var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerAlertsComponent>(playerEnt.Uid);
                 Assert.NotNull(alertsComponent);
 
                 // show 2 alerts
@@ -49,7 +51,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
                 Assert.NotNull(local);
                 var controlled = local.ControlledEntity;
                 Assert.NotNull(controlled);
-                var alertsComponent = controlled.GetComponent<ClientAlertsComponent>();
+                var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientAlertsComponent>(controlled.Uid);
                 Assert.NotNull(alertsComponent);
 
                 // find the alertsui
@@ -69,7 +71,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
             {
                 var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
                 Assert.NotNull(playerEnt);
-                var alertsComponent = playerEnt.GetComponent<ServerAlertsComponent>();
+                var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerAlertsComponent>(playerEnt.Uid);
                 Assert.NotNull(alertsComponent);
 
                 alertsComponent.ClearAlert(AlertType.Debug1);
@@ -84,7 +86,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
                 Assert.NotNull(local);
                 var controlled = local.ControlledEntity;
                 Assert.NotNull(controlled);
-                var alertsComponent = controlled.GetComponent<ClientAlertsComponent>();
+                var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientAlertsComponent>(controlled.Uid);
                 Assert.NotNull(alertsComponent);
 
                 // find the alertsui

Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs

@@ -60,7 +60,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Movement
                 // Now let's make the player enter a climbing transitioning state.
                 climbing.IsClimbing = true;
                 climbing.TryMoveTo(human.Transform.WorldPosition, table.Transform.WorldPosition);
-                var body = human.GetComponent<IPhysBody>();
+                var body = IoCManager.Resolve<IEntityManager>().GetComponent<IPhysBody>(human.Uid);
                 // TODO: Check it's climbing
 
                 // Force the player out of climb state. It should immediately remove the ClimbController.

Content.IntegrationTests/Tests/GravityGridTest.cs

@@ -53,15 +53,15 @@ namespace Content.IntegrationTests.Tests
                 Assert.That(generator.HasComponent<GravityGeneratorComponent>());
                 Assert.That(generator.HasComponent<ApcPowerReceiverComponent>());
 
-                var powerComponent = generator.GetComponent<ApcPowerReceiverComponent>();
+                var powerComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ApcPowerReceiverComponent>(generator.Uid);
                 powerComponent.NeedsPower = false;
             });
             server.RunTicks(1);
 
             server.Assert(() =>
             {
-                var generatorComponent = generator.GetComponent<GravityGeneratorComponent>();
+                var generatorComponent = IoCManager.Resolve<IEntityManager>().GetComponent<GravityGeneratorComponent>(generator.Uid);
-                var powerComponent = generator.GetComponent<ApcPowerReceiverComponent>();
+                var powerComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ApcPowerReceiverComponent>(generator.Uid);
 
                 Assert.That(generatorComponent.GravityActive, Is.True);
 
@@ -69,8 +69,8 @@ namespace Content.IntegrationTests.Tests
                 var grid1Entity = entityMan.GetEntity(grid1.GridEntityId);
                 var grid2Entity = entityMan.GetEntity(grid2.GridEntityId);
 
-                Assert.That(!grid1Entity.GetComponent<GravityComponent>().Enabled);
+                Assert.That(!IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(grid1Entity.Uid).Enabled);
-                Assert.That(grid2Entity.GetComponent<GravityComponent>().Enabled);
+                Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(grid2Entity.Uid).Enabled);
 
                 // Re-enable needs power so it turns off again.
                 // Charge rate is ridiculously high so it finishes in one tick.
@@ -79,14 +79,14 @@ namespace Content.IntegrationTests.Tests
             server.RunTicks(1);
             server.Assert(() =>
             {
-                var generatorComponent = generator.GetComponent<GravityGeneratorComponent>();
+                var generatorComponent = IoCManager.Resolve<IEntityManager>().GetComponent<GravityGeneratorComponent>(generator.Uid);
 
                 Assert.That(generatorComponent.GravityActive, Is.False);
 
                 var entityMan = IoCManager.Resolve<IEntityManager>();
                 var grid2Entity = entityMan.GetEntity(grid2.GridEntityId);
 
-                Assert.That(grid2Entity.GetComponent<GravityComponent>().Enabled, Is.False);
+                Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(grid2Entity.Uid).Enabled, Is.False);
             });
 
             await server.WaitIdleAsync();

Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs

@@ -81,7 +81,7 @@ namespace Content.IntegrationTests.Tests
                 pocketItem = entityMan.SpawnEntity("FlashlightDummy", MapCoordinates.Nullspace);
                 var tooBigItem = entityMan.SpawnEntity("ToolboxDummy", MapCoordinates.Nullspace);
 
-                inventory = human.GetComponent<InventoryComponent>();
+                inventory = IoCManager.Resolve<IEntityManager>().GetComponent<InventoryComponent>(human.Uid);
 
                 Assert.That(inventory.CanEquip(Slots.INNERCLOTHING, uniform));
 

Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs

@@ -96,7 +96,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
                 Assert.That(interactHand);
 
                 Assert.That(user.TryGetComponent<HandsComponent>(out var hands));
-                Assert.That(hands.PutInHand(item.GetComponent<ItemComponent>()));
+                Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item.Uid)));
 
                 interactionSystem.UserInteraction(user, target.Transform.Coordinates, target.Uid);
                 Assert.That(interactUsing);
@@ -168,7 +168,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
                 Assert.That(interactHand, Is.False);
 
                 Assert.That(user.TryGetComponent<HandsComponent>(out var hands));
-                Assert.That(hands.PutInHand(item.GetComponent<ItemComponent>()));
+                Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item.Uid)));
 
                 interactionSystem.UserInteraction(user, target.Transform.Coordinates, target.Uid);
                 Assert.That(interactUsing, Is.False);
@@ -237,7 +237,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
                 Assert.That(interactHand);
 
                 Assert.That(user.TryGetComponent<HandsComponent>(out var hands));
-                Assert.That(hands.PutInHand(item.GetComponent<ItemComponent>()));
+                Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item.Uid)));
 
                 interactionSystem.UserInteraction(user, target.Transform.Coordinates, target.Uid);
                 Assert.That(interactUsing);
@@ -307,7 +307,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
                 Assert.That(interactHand, Is.False);
 
                 Assert.That(user.TryGetComponent<HandsComponent>(out var hands));
-                Assert.That(hands.PutInHand(item.GetComponent<ItemComponent>()));
+                Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item.Uid)));
 
                 interactionSystem.UserInteraction(user, target.Transform.Coordinates, target.Uid);
                 Assert.That(interactUsing, Is.False);
@@ -392,7 +392,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
                 Assert.That(interactHand);
 
                 Assert.That(user.TryGetComponent<HandsComponent>(out var hands));
-                Assert.That(hands.PutInHand(item.GetComponent<ItemComponent>()));
+                Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item.Uid)));
 
                 interactionSystem.UserInteraction(user, target.Transform.Coordinates, target.Uid);
                 Assert.That(interactUsing, Is.False);

Content.IntegrationTests/Tests/InventoryHelpersTest.cs

@@ -62,7 +62,7 @@ namespace Content.IntegrationTests.Tests
                 var entityMan = IoCManager.Resolve<IEntityManager>();
 
                 human = entityMan.SpawnEntity("InventoryStunnableDummy", MapCoordinates.Nullspace);
-                inventory = human.GetComponent<InventoryComponent>();
+                inventory = IoCManager.Resolve<IEntityManager>().GetComponent<InventoryComponent>(human.Uid);
 
                 // Can't do the test if this human doesn't have the slots for it.
                 Assert.That(inventory.HasSlot(Slots.INNERCLOTHING));

Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs

@@ -112,8 +112,8 @@ namespace Content.IntegrationTests.Tests.Networking
 
             await client.WaitPost(() =>
             {
-                clientComponent = cEntityManager.GetEntity(serverEnt.Uid)
+                IEntity tempQualifier = cEntityManager.GetEntity(serverEnt.Uid);
-                    .GetComponent<PredictionTestComponent>();
+                clientComponent = IoCManager.Resolve<IEntityManager>().GetComponent<PredictionTestComponent>(tempQualifier.Uid);
             });
 
             Assert.That(clientComponent.Foo, Is.False);
@@ -457,7 +457,7 @@ namespace Content.IntegrationTests.Tests.Networking
             private void HandleMessage(SetFooMessage message, EntitySessionEventArgs args)
             {
                 var entity = EntityManager.GetEntity(message.Uid);
-                var component = entity.GetComponent<PredictionTestComponent>();
+                var component = IoCManager.Resolve<IEntityManager>().GetComponent<PredictionTestComponent>(entity.Uid);
                 var old = component.Foo;
                 if (Allow)
                 {

Content.IntegrationTests/Tests/PDA/PDAExtensionsTests.cs

@@ -9,6 +9,7 @@ using Content.Shared.Containers.ItemSlots;
 using NUnit.Framework;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.IntegrationTests.Tests.PDA
 {
@@ -70,13 +71,13 @@ namespace Content.IntegrationTests.Tests.PDA
 
                 // Put PDA in hand
                 var dummyPda = sEntityManager.SpawnEntity(PdaDummy, player.Transform.MapPosition);
-                var pdaItemComponent = dummyPda.GetComponent<ItemComponent>();
+                var pdaItemComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(dummyPda.Uid);
-                player.GetComponent<HandsComponent>().PutInHand(pdaItemComponent);
+                IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(player.Uid).PutInHand(pdaItemComponent);
 
-                var pdaComponent = dummyPda.GetComponent<PDAComponent>();
+                var pdaComponent = IoCManager.Resolve<IEntityManager>().GetComponent<PDAComponent>(dummyPda.Uid);
                 var pdaIdCard = sEntityManager.SpawnEntity(IdCardDummy, player.Transform.MapPosition);
 
-                var itemSlots = dummyPda.GetComponent<ItemSlotsComponent>();
+                var itemSlots = IoCManager.Resolve<IEntityManager>().GetComponent<ItemSlotsComponent>(dummyPda.Uid);
                 sEntityManager.EntitySysManager.GetEntitySystem<ItemSlotsSystem>()
                     .TryInsert(dummyPda.Uid, pdaComponent.IdSlot, pdaIdCard);
                 var pdaContainedId = pdaComponent.ContainedID;
@@ -90,10 +91,10 @@ namespace Content.IntegrationTests.Tests.PDA
 
                 // Put ID card in hand
                 var idDummy = sEntityManager.SpawnEntity(IdCardDummy, player.Transform.MapPosition);
-                var idItemComponent = idDummy.GetComponent<ItemComponent>();
+                var idItemComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(idDummy.Uid);
-                player.GetComponent<HandsComponent>().PutInHand(idItemComponent);
+                IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(player.Uid).PutInHand(idItemComponent);
 
-                var idCardComponent = idDummy.GetComponent<IdCardComponent>();
+                var idCardComponent = IoCManager.Resolve<IEntityManager>().GetComponent<IdCardComponent>(idDummy.Uid);
 
                 // The ID in the hand should be found first
                 Assert.NotNull(player.GetHeldId());
@@ -102,7 +103,7 @@ namespace Content.IntegrationTests.Tests.PDA
                 Assert.That(id, Is.EqualTo(idCardComponent));
 
                 // Remove all IDs and PDAs
-                var inventory = player.GetComponent<InventoryComponent>();
+                var inventory = IoCManager.Resolve<IEntityManager>().GetComponent<InventoryComponent>(player.Uid);
 
                 foreach (var slot in inventory.Slots)
                 {
@@ -119,7 +120,7 @@ namespace Content.IntegrationTests.Tests.PDA
                     }
                 }
 
-                var hands = player.GetComponent<HandsComponent>();
+                var hands = IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(player.Uid);
 
                 hands.Drop(dummyPda, false);
                 hands.Drop(idDummy, false);

Content.IntegrationTests/Tests/Power/PowerTest.cs

@@ -8,6 +8,7 @@ using Content.Server.Power.Nodes;
 using Content.Shared.Coordinates;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
@@ -204,9 +205,9 @@ namespace Content.IntegrationTests.Tests.Power
                 var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1));
                 var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
 
-                supplier = generatorEnt.GetComponent<PowerSupplierComponent>();
+                supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(generatorEnt.Uid);
-                consumer1 = consumerEnt1.GetComponent<PowerConsumerComponent>();
+                consumer1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt1.Uid);
-                consumer2 = consumerEnt2.GetComponent<PowerConsumerComponent>();
+                consumer2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt2.Uid);
 
                 // Plenty of surplus and tolerance
                 supplier.MaxSupply = loadPower * 4;
@@ -258,9 +259,9 @@ namespace Content.IntegrationTests.Tests.Power
                 var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1));
                 var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
 
-                supplier = generatorEnt.GetComponent<PowerSupplierComponent>();
+                supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(generatorEnt.Uid);
-                consumer1 = consumerEnt1.GetComponent<PowerConsumerComponent>();
+                consumer1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt1.Uid);
-                consumer2 = consumerEnt2.GetComponent<PowerConsumerComponent>();
+                consumer2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt2.Uid);
 
                 // Too little supply, both consumers should get 33% power.
                 supplier.MaxSupply = loadPower;
@@ -305,8 +306,8 @@ namespace Content.IntegrationTests.Tests.Power
                 var generatorEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
                 var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
 
-                supplier = generatorEnt.GetComponent<PowerSupplierComponent>();
+                supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(generatorEnt.Uid);
-                consumer = consumerEnt.GetComponent<PowerConsumerComponent>();
+                consumer = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt.Uid);
 
                 // Supply has enough total power but needs to ramp up to match.
                 supplier.MaxSupply = 400;
@@ -375,9 +376,9 @@ namespace Content.IntegrationTests.Tests.Power
                 var generatorEnt = _entityManager.SpawnEntity("DischargingBatteryDummy", grid.ToCoordinates());
                 var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
 
-                netBattery = generatorEnt.GetComponent<PowerNetworkBatteryComponent>();
+                netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(generatorEnt.Uid);
-                battery = generatorEnt.GetComponent<BatteryComponent>();
+                battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(generatorEnt.Uid);
-                consumer = consumerEnt.GetComponent<PowerConsumerComponent>();
+                consumer = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt.Uid);
 
                 battery.MaxCharge = startingCharge;
                 battery.CurrentCharge = startingCharge;
@@ -453,9 +454,9 @@ namespace Content.IntegrationTests.Tests.Power
                 var generatorEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
                 var batteryEnt = _entityManager.SpawnEntity("ChargingBatteryDummy", grid.ToCoordinates(0, 2));
 
-                supplier = generatorEnt.GetComponent<PowerSupplierComponent>();
+                supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(generatorEnt.Uid);
-                var netBattery = batteryEnt.GetComponent<PowerNetworkBatteryComponent>();
+                var netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt.Uid);
-                battery = batteryEnt.GetComponent<BatteryComponent>();
+                battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt.Uid);
 
                 supplier.MaxSupply = 500;
                 supplier.SupplyRampTolerance = 500;
@@ -504,10 +505,10 @@ namespace Content.IntegrationTests.Tests.Power
                 var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
                 var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
 
-                consumer = consumerEnt.GetComponent<PowerConsumerComponent>();
+                consumer = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt.Uid);
-                supplier = supplyEnt.GetComponent<PowerSupplierComponent>();
+                supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(supplyEnt.Uid);
-                netBattery = batteryEnt.GetComponent<PowerNetworkBatteryComponent>();
+                netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt.Uid);
-                battery = batteryEnt.GetComponent<BatteryComponent>();
+                battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt.Uid);
 
                 // Consumer needs 1000 W, supplier can only provide 800, battery fills in the remaining 200.
                 consumer.DrawRate = 1000;
@@ -572,10 +573,10 @@ namespace Content.IntegrationTests.Tests.Power
                 var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
                 var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
 
-                consumer = consumerEnt.GetComponent<PowerConsumerComponent>();
+                consumer = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt.Uid);
-                supplier = supplyEnt.GetComponent<PowerSupplierComponent>();
+                supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(supplyEnt.Uid);
-                netBattery = batteryEnt.GetComponent<PowerNetworkBatteryComponent>();
+                netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt.Uid);
-                battery = batteryEnt.GetComponent<BatteryComponent>();
+                battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt.Uid);
 
                 // Consumer needs 1000 W, supply and battery can only provide 400 each.
                 // BUT the battery has 50% input efficiency, so 50% of the power of the supply gets lost.
@@ -650,13 +651,13 @@ namespace Content.IntegrationTests.Tests.Power
                 var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0));
                 var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 4));
 
-                consumer1 = consumerEnt1.GetComponent<PowerConsumerComponent>();
+                consumer1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt1.Uid);
-                consumer2 = consumerEnt2.GetComponent<PowerConsumerComponent>();
+                consumer2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt2.Uid);
-                supplier = supplyEnt.GetComponent<PowerSupplierComponent>();
+                supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(supplyEnt.Uid);
-                var netBattery1 = batteryEnt1.GetComponent<PowerNetworkBatteryComponent>();
+                var netBattery1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt1.Uid);
-                var netBattery2 = batteryEnt2.GetComponent<PowerNetworkBatteryComponent>();
+                var netBattery2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt2.Uid);
-                var battery1 = batteryEnt1.GetComponent<BatteryComponent>();
+                var battery1 = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt1.Uid);
-                var battery2 = batteryEnt2.GetComponent<BatteryComponent>();
+                var battery2 = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt2.Uid);
 
                 // There are two loads, 500 W and 1000 W respectively.
                 // The 500 W load is behind a 50% efficient battery,
@@ -737,13 +738,13 @@ namespace Content.IntegrationTests.Tests.Power
                 var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0));
                 var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 4));
 
-                consumer1 = consumerEnt1.GetComponent<PowerConsumerComponent>();
+                consumer1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt1.Uid);
-                consumer2 = consumerEnt2.GetComponent<PowerConsumerComponent>();
+                consumer2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt2.Uid);
-                supplier = supplyEnt.GetComponent<PowerSupplierComponent>();
+                supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(supplyEnt.Uid);
-                var netBattery1 = batteryEnt1.GetComponent<PowerNetworkBatteryComponent>();
+                var netBattery1 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt1.Uid);
-                var netBattery2 = batteryEnt2.GetComponent<PowerNetworkBatteryComponent>();
+                var netBattery2 = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt2.Uid);
-                var battery1 = batteryEnt1.GetComponent<BatteryComponent>();
+                var battery1 = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt1.Uid);
-                var battery2 = batteryEnt2.GetComponent<BatteryComponent>();
+                var battery2 = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt2.Uid);
 
                 consumer1.DrawRate = 500;
                 consumer2.DrawRate = 1000;
@@ -805,10 +806,10 @@ namespace Content.IntegrationTests.Tests.Power
                 var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
                 var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
 
-                consumer = consumerEnt.GetComponent<PowerConsumerComponent>();
+                consumer = IoCManager.Resolve<IEntityManager>().GetComponent<PowerConsumerComponent>(consumerEnt.Uid);
-                supplier = supplyEnt.GetComponent<PowerSupplierComponent>();
+                supplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(supplyEnt.Uid);
-                netBattery = batteryEnt.GetComponent<PowerNetworkBatteryComponent>();
+                netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(batteryEnt.Uid);
-                var battery = batteryEnt.GetComponent<BatteryComponent>();
+                var battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(batteryEnt.Uid);
 
                 // Consumer needs 1000 W, supplier can only provide 800, battery fills in the remaining 200.
                 consumer.DrawRate = 1000;
@@ -881,10 +882,10 @@ namespace Content.IntegrationTests.Tests.Power
                 terminal.Transform.LocalRotation = Angle.FromDegrees(180);
 
                 var battery = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
-                var batteryNodeContainer = battery.GetComponent<NodeContainerComponent>();
+                var batteryNodeContainer = IoCManager.Resolve<IEntityManager>().GetComponent<NodeContainerComponent>(battery.Uid);
 
-                leftNode = leftEnt.GetComponent<NodeContainerComponent>().GetNode<CableNode>("power");
+                leftNode = IoCManager.Resolve<IEntityManager>().GetComponent<NodeContainerComponent>(leftEnt.Uid).GetNode<CableNode>("power");
-                rightNode = rightEnt.GetComponent<NodeContainerComponent>().GetNode<CableNode>("power");
+                rightNode = IoCManager.Resolve<IEntityManager>().GetComponent<NodeContainerComponent>(rightEnt.Uid).GetNode<CableNode>("power");
 
                 batteryInput = batteryNodeContainer.GetNode<Node>("input");
                 batteryOutput = batteryNodeContainer.GetNode<Node>("output");
@@ -930,9 +931,9 @@ namespace Content.IntegrationTests.Tests.Power
                 var substationEnt = _entityManager.SpawnEntity("SubstationDummy", grid.ToCoordinates(0, 1));
                 var apcEnt = _entityManager.SpawnEntity("ApcDummy", grid.ToCoordinates(0, 2));
 
-                var generatorSupplier = generatorEnt.GetComponent<PowerSupplierComponent>();
+                var generatorSupplier = IoCManager.Resolve<IEntityManager>().GetComponent<PowerSupplierComponent>(generatorEnt.Uid);
-                substationNetBattery = substationEnt.GetComponent<PowerNetworkBatteryComponent>();
+                substationNetBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(substationEnt.Uid);
-                apcBattery = apcEnt.GetComponent<BatteryComponent>();
+                apcBattery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(apcEnt.Uid);
 
                 generatorSupplier.MaxSupply = 1000;
                 generatorSupplier.SupplyRampTolerance = 1000;
@@ -972,9 +973,9 @@ namespace Content.IntegrationTests.Tests.Power
                 var apcExtensionEnt = _entityManager.SpawnEntity("CableApcExtension", grid.ToCoordinates(0, 0));
                 var powerReceiverEnt = _entityManager.SpawnEntity("ApcPowerReceiverDummy", grid.ToCoordinates(0, 2));
 
-                receiver = powerReceiverEnt.GetComponent<ApcPowerReceiverComponent>();
+                receiver = IoCManager.Resolve<IEntityManager>().GetComponent<ApcPowerReceiverComponent>(powerReceiverEnt.Uid);
-                var battery = apcEnt.GetComponent<BatteryComponent>();
+                var battery = IoCManager.Resolve<IEntityManager>().GetComponent<BatteryComponent>(apcEnt.Uid);
-                apcNetBattery = apcEnt.GetComponent<PowerNetworkBatteryComponent>();
+                apcNetBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(apcEnt.Uid);
 
                 _extensionCableSystem.SetProviderTransferRange(apcExtensionEnt.Uid, 5);
                 _extensionCableSystem.SetReceiverReceptionRange(powerReceiverEnt.Uid, 5);

Content.IntegrationTests/Tests/Tag/TagTest.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Content.Shared.Tag;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
@@ -60,7 +61,7 @@ namespace Content.IntegrationTests.Tests.Tag
             {
                 sMapManager.CreateNewMapEntity(MapId.Nullspace);
                 sTagDummy = sEntityManager.SpawnEntity(TagEntityId, MapCoordinates.Nullspace);
-                sTagComponent = sTagDummy.GetComponent<TagComponent>();
+                sTagComponent = IoCManager.Resolve<IEntityManager>().GetComponent<TagComponent>(sTagDummy.Uid);
             });
 
             await server.WaitAssertion(() =>

Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs

@@ -4,6 +4,7 @@ using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Whitelist;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
 namespace Content.IntegrationTests.Tests.Utility
@@ -98,7 +99,7 @@ namespace Content.IntegrationTests.Tests.Utility
 
                 // Test from serialized
                 var dummy = entityManager.SpawnEntity("WhitelistDummy", mapCoordinates);
-                var whitelistSer = dummy.GetComponent<ItemSlotsComponent>().Slots.Values.First().Whitelist;
+                var whitelistSer = IoCManager.Resolve<IEntityManager>().GetComponent<ItemSlotsComponent>(dummy.Uid).Slots.Values.First().Whitelist;
                 Assert.That(whitelistSer, Is.Not.Null);
 
                 Assert.That(whitelistSer.Components, Is.Not.Null);

Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs

@@ -3,6 +3,7 @@ using Content.Server.Access.Components;
 using Content.Server.Access.Systems;
 using Content.Server.AI.Components;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Physics;
 
 namespace Content.Server.AI.Pathfinding.Accessible
@@ -35,7 +36,7 @@ namespace Content.Server.AI.Pathfinding.Accessible
 
             var accessSystem = EntitySystem.Get<AccessReaderSystem>();
             var access = accessSystem.FindAccessTags(entity.Uid);
-            var visionRadius = entity.GetComponent<AiControllerComponent>().VisionRadius;
+            var visionRadius = IoCManager.Resolve<IEntityManager>().GetComponent<AiControllerComponent>(entity.Uid).VisionRadius;
 
             return new ReachableArgs(visionRadius, access, collisionMask);
         }

Content.Server/AME/Components/AMEControllerComponent.cs

@@ -15,6 +15,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -156,7 +157,7 @@ namespace Content.Server.AME.Components
                 return new AMEControllerBoundUserInterfaceState(Powered, IsMasterController(), false, HasJar, 0, InjectionAmount, GetCoreCount());
             }
 
-            var jarcomponent = jar.GetComponent<AMEFuelContainerComponent>();
+            var jarcomponent = IoCManager.Resolve<IEntityManager>().GetComponent<AMEFuelContainerComponent>(jar.Uid);
             return new AMEControllerBoundUserInterfaceState(Powered, IsMasterController(), _injecting, HasJar, jarcomponent.FuelAmount, InjectionAmount, GetCoreCount());
         }
 

Content.Server/Access/Components/IdCardConsoleComponent.cs

@@ -133,8 +133,8 @@ namespace Content.Server.Access.Components
             }
             else
             {
-                var targetIdComponent = targetIdEntity.GetComponent<IdCardComponent>();
+                var targetIdComponent = IoCManager.Resolve<IEntityManager>().GetComponent<IdCardComponent>(targetIdEntity.Uid);
-                var targetAccessComponent = targetIdEntity.GetComponent<AccessComponent>();
+                var targetAccessComponent = IoCManager.Resolve<IEntityManager>().GetComponent<AccessComponent>(targetIdEntity.Uid);
                 newState = new IdCardConsoleBoundUserInterfaceState(
                     PrivilegedIdSlot.HasItem,
                     PrivilegedIdIsAuthorized(),

Content.Server/Access/Systems/AccessReaderSystem.cs

@@ -108,7 +108,13 @@ namespace Content.Server.Access.Systems
 
             if (EntityManager.TryGetComponent(uid, out PDAComponent? pda))
             {
-                tags = pda?.ContainedID?.Owner?.GetComponent<AccessComponent>()?.Tags;
+                IEntity tempQualifier = pda?.ContainedID?.Owner;
+                if (tempQualifier != null)
+                {
+                    IoCManager.Resolve<IEntityManager>().GetComponent<AccessComponent>(tempQualifier.Uid);
+                }
+
+                tags = RETURNED_VALUE?.Tags;
                 return tags != null;
             }
 

Content.Server/Administration/Commands/AGhost.cs

@@ -61,7 +61,7 @@ namespace Content.Server.Administration.Commands
                 mind.TransferTo(ghost.Uid);
             }
 
-            var comp = ghost.GetComponent<GhostComponent>();
+            var comp = IoCManager.Resolve<IEntityManager>().GetComponent<GhostComponent>(ghost.Uid);
             EntitySystem.Get<SharedGhostSystem>().SetCanReturnToBody(comp, canReturn);
         }
     }

Content.Server/Administration/Commands/SetOutfitCommand.cs

@@ -106,7 +106,7 @@ namespace Content.Server.Administration.Commands
                     pdaComponent.ContainedID.FullName = target.Name;
                 }
 
-                inventoryComponent.Equip(slot, equipmentEntity.GetComponent<ItemComponent>(), false);
+                inventoryComponent.Equip(slot, IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(equipmentEntity.Uid), false);
             }
         }
     }

Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs

@@ -205,7 +205,8 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
                 if (container.ContainedEntities.Count > 0)
                 {
-                    var gasTank = container.ContainedEntities[0].GetComponent<GasTankComponent>();
+                    IEntity tempQualifier = container.ContainedEntities[0];
+                    var gasTank = IoCManager.Resolve<IEntityManager>().GetComponent<GasTankComponent>(tempQualifier.Uid);
                     _atmosphereSystem.ReleaseGasTo(canister.Air, gasTank.Air, canister.ReleasePressure);
                 }
                 else

Content.Server/Body/Components/BodyPartComponent.cs

@@ -141,8 +141,8 @@ namespace Content.Server.Body.Components
 
             if (_optionsCache.Count > 0)
             {
-                OpenSurgeryUI(eventArgs.User.GetComponent<ActorComponent>().PlayerSession);
+                OpenSurgeryUI(IoCManager.Resolve<IEntityManager>().GetComponent<ActorComponent>(eventArgs.User.Uid).PlayerSession);
-                BodyPartSlotRequest(eventArgs.User.GetComponent<ActorComponent>().PlayerSession,
+                BodyPartSlotRequest(IoCManager.Resolve<IEntityManager>().GetComponent<ActorComponent>(eventArgs.User.Uid).PlayerSession,
                     toSend);
                 _surgeonCache = eventArgs.User;
                 _owningBodyCache = body;

Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs

@@ -129,8 +129,8 @@ namespace Content.Server.Body.Surgery.Components
 
             if (_optionsCache.Count > 0 && PerformerCache != null)
             {
-                OpenSurgeryUI(PerformerCache.GetComponent<ActorComponent>().PlayerSession);
+                OpenSurgeryUI(IoCManager.Resolve<IEntityManager>().GetComponent<ActorComponent>(PerformerCache.Uid).PlayerSession);
-                UpdateSurgeryUIMechanismRequest(PerformerCache.GetComponent<ActorComponent>().PlayerSession,
+                UpdateSurgeryUIMechanismRequest(IoCManager.Resolve<IEntityManager>().GetComponent<ActorComponent>(PerformerCache.Uid).PlayerSession,
                     toSend);
                 _callbackCache = callback;
             }

Content.Server/Buckle/Systems/StrapSystem.cs

@@ -39,7 +39,7 @@ namespace Content.Server.Buckle.Systems
             // Add unstrap verbs for every strapped entity.
             foreach (var entity in component.BuckledEntities)
             {
-                var buckledComp = entity.GetComponent<BuckleComponent>();
+                var buckledComp = IoCManager.Resolve<IEntityManager>().GetComponent<BuckleComponent>(entity.Uid);
 
                 if (!_interactionSystem.InRangeUnobstructed(args.User, args.Target, range: buckledComp.Range))
                     continue;

Content.Server/Chat/Commands/SuicideCommand.cs

@@ -88,7 +88,7 @@ namespace Content.Server.Chat.Commands
             EntitySystem.Get<AdminLogSystem>().Add(LogType.Suicide, $"{player.AttachedEntity} is committing suicide");
 
             // Held item suicide
-            var handsComponent = owner.GetComponent<HandsComponent>();
+            var handsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(owner.Uid);
             var itemComponent = handsComponent.GetActiveHand;
             if (itemComponent != null)
             {

Content.Server/Chemistry/TileReactions/SpillTileReaction.cs

@@ -5,6 +5,8 @@ using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Slippery;
 using JetBrains.Annotations;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization.Manager.Attributes;
 
@@ -28,7 +30,7 @@ namespace Content.Server.Chemistry.TileReactions
 
             if (puddle != null)
             {
-                var slippery = puddle.Owner.GetComponent<SlipperyComponent>();
+                var slippery = IoCManager.Resolve<IEntityManager>().GetComponent<SlipperyComponent>(puddle.Owner.Uid);
                 slippery.LaunchForwardsMultiplier = _launchForwardsMultiplier;
                 slippery.RequiredSlipSpeed = _requiredSlipSpeed;
                 slippery.ParalyzeTime = _paralyzeTime;

Content.Server/Climbing/Components/ClimbableComponent.cs

@@ -10,6 +10,7 @@ using Content.Shared.Interaction.Helpers;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
@@ -165,7 +166,7 @@ namespace Content.Server.Climbing.Components
                 var direction = (Owner.Transform.WorldPosition - entityPos).Normalized;
                 var endPoint = Owner.Transform.WorldPosition;
 
-                var climbMode = entityToMove.GetComponent<ClimbingComponent>();
+                var climbMode = IoCManager.Resolve<IEntityManager>().GetComponent<ClimbingComponent>(entityToMove.Uid);
                 climbMode.IsClimbing = true;
 
                 if (MathF.Abs(direction.X) < 0.6f) // user climbed mostly vertically so lets make it a clean straight line
@@ -213,7 +214,7 @@ namespace Content.Server.Climbing.Components
                 var direction = (Owner.Transform.WorldPosition - userPos).Normalized;
                 var endPoint = Owner.Transform.WorldPosition;
 
-                var climbMode = user.GetComponent<ClimbingComponent>();
+                var climbMode = IoCManager.Resolve<IEntityManager>().GetComponent<ClimbingComponent>(user.Uid);
                 climbMode.IsClimbing = true;
 
                 if (MathF.Abs(direction.X) < 0.6f) // user climbed mostly vertically so lets make it a clean straight line

Content.Server/Clothing/Components/ClothingComponent.cs

@@ -8,6 +8,7 @@ using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
+using Robust.Shared.IoC;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
@@ -79,14 +80,14 @@ namespace Content.Server.Clothing.Components
                     {
                         hands.Drop(item.Owner);
                         inv.Equip(slot, item);
-                        hands.PutInHand(Owner.GetComponent<ItemComponent>());
+                        hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(Owner.Uid));
                     }
                 }
                 else
                 {
                     hands.Drop(Owner);
                     if (!TryEquip(inv, slot, eventArgs.User))
-                        hands.PutInHand(Owner.GetComponent<ItemComponent>());
+                        hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(Owner.Uid));
                 }
 
                 return true;

Content.Server/Construction/Completions/SpawnPrototype.cs

@@ -26,7 +26,7 @@ namespace Content.Server.Construction.Completions
             if (EntityPrototypeHelpers.HasComponent<StackComponent>(Prototype))
             {
                 var stackEnt = entityManager.SpawnEntity(Prototype, coordinates);
-                var stack = stackEnt.GetComponent<StackComponent>();
+                var stack = IoCManager.Resolve<IEntityManager>().GetComponent<StackComponent>(stackEnt.Uid);
                 entityManager.EntitySysManager.GetEntitySystem<StackSystem>().SetCount(stackEnt.Uid, Amount, stack);
             }
             else

Content.Server/Construction/ConstructionSystem.Initial.cs

@@ -238,7 +238,7 @@ namespace Content.Server.Construction
             var newEntity = EntityManager.SpawnEntity(graph.Nodes[edge.Target].Entity, user.Transform.Coordinates);
 
             // Yes, this should throw if it's missing the component.
-            var construction = newEntity.GetComponent<ConstructionComponent>();
+            var construction = IoCManager.Resolve<IEntityManager>().GetComponent<ConstructionComponent>(newEntity.Uid);
 
             // We attempt to set the pathfinding target.
             SetPathfindingTarget(newEntity.Uid, targetNode.Name, construction);

Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs

@@ -4,6 +4,7 @@ using Content.Server.Stack;
 using Content.Shared.Prototypes;
 using Content.Shared.Random.Helpers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
@@ -33,7 +34,7 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
                 if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId))
                 {
                     var spawned = system.EntityManager.SpawnEntity(entityId, position);
-                    var stack = spawned.GetComponent<StackComponent>();
+                    var stack = IoCManager.Resolve<IEntityManager>().GetComponent<StackComponent>(spawned.Uid);
                     EntitySystem.Get<StackSystem>().SetCount(spawned.Uid, count, stack);
                     spawned.RandomOffset(0.5f);
                 }

Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs

@@ -22,7 +22,7 @@ namespace Content.Server.Disposal.Tube.Components
         public bool TryInsert(DisposalUnitComponent from)
         {
             var holder = IoCManager.Resolve<IEntityManager>().SpawnEntity(HolderPrototypeId, Owner.Transform.MapPosition);
-            var holderComponent = holder.GetComponent<DisposalHolderComponent>();
+            var holderComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DisposalHolderComponent>(holder.Uid);
 
             foreach (var entity in from.ContainedEntities.ToArray())
             {

Content.Server/Electrocution/ElectrocutionSystem.cs

@@ -277,11 +277,10 @@ namespace Content.Server.Electrocution
             var electrocutionEntity = EntityManager.SpawnEntity(
                 $"VirtualElectrocutionLoad{node.NodeGroupID}", sourceTransform.Coordinates);
 
-            var electrocutionNode = electrocutionEntity
+            var electrocutionNode = IoCManager.Resolve<IEntityManager>().GetComponent<NodeContainerComponent>(electrocutionEntity.Uid)
-                .GetComponent<NodeContainerComponent>()
                 .GetNode<ElectrocutionNode>("electrocution");
 
-            var electrocutionComponent = electrocutionEntity.GetComponent<ElectrocutionComponent>();
+            var electrocutionComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ElectrocutionComponent>(electrocutionEntity.Uid);
 
             electrocutionNode.CableEntity = sourceUid;
             electrocutionNode.NodeName = node.Name;

Content.Server/Fluids/Components/SpillExtensions.cs

@@ -194,7 +194,7 @@ namespace Content.Server.Fluids.Components
             }
 
             var puddleEnt = serverEntityManager.SpawnEntity(prototype, spillGridCoords);
-            var newPuddleComponent = puddleEnt.GetComponent<PuddleComponent>();
+            var newPuddleComponent = IoCManager.Resolve<IEntityManager>().GetComponent<PuddleComponent>(puddleEnt.Uid);
 
             puddleSystem.TryAddSolution(newPuddleComponent.Owner.Uid, solution, sound);
 

Content.Server/Fluids/Components/SprayComponent.cs

@@ -144,7 +144,7 @@ namespace Content.Server.Fluids.Components
                 }
 
                 // Add the solution to the vapor and actually send the thing
-                var vaporComponent = vapor.GetComponent<VaporComponent>();
+                var vaporComponent = IoCManager.Resolve<IEntityManager>().GetComponent<VaporComponent>(vapor.Uid);
                 var vaporSystem = EntitySystem.Get<VaporSystem>();
                 vaporSystem.TryAddSolution(vaporComponent, solution);
 

Content.Server/Fluids/EntitySystems/PuddleSystem.cs

@@ -329,9 +329,10 @@ namespace Content.Server.Fluids.EntitySystems
             }
 
             puddle ??= () =>
-                IoCManager.Resolve<IEntityManager>().SpawnEntity(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(puddleComponent.Owner.Uid).EntityPrototype?.ID,
+            {
-                        mapGrid.DirectionToGrid(coords, direction))
+                return IoCManager.Resolve<IEntityManager>().GetComponent<PuddleComponent>(IoCManager.Resolve<IEntityManager>().SpawnEntity(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(puddleComponent.Owner.Uid).EntityPrototype?.ID,
-                    .GetComponent<PuddleComponent>();
+                    mapGrid.DirectionToGrid(coords, direction)).Uid);
+            };
 
             return true;
         }

Content.Server/GameTicking/GameTicker.Spawning.cs

@@ -191,7 +191,7 @@ namespace Content.Server.GameTicking
 
             var mob = SpawnObserverMob();
             mob.Name = name;
-            var ghost = mob.GetComponent<GhostComponent>();
+            var ghost = IoCManager.Resolve<IEntityManager>().GetComponent<GhostComponent>(mob.Uid);
             EntitySystem.Get<SharedGhostSystem>().SetCanReturnToBody(ghost, false);
             newMind.TransferTo(mob.Uid);
 
@@ -238,7 +238,7 @@ namespace Content.Server.GameTicking
                     if (!string.IsNullOrEmpty(equipmentStr))
                     {
                         var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, entity.Transform.Coordinates);
-                        inventory.Equip(slot, equipmentEntity.GetComponent<ItemComponent>());
+                        inventory.Equip(slot, IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(equipmentEntity.Uid));
                     }
                 }
             }
@@ -273,7 +273,7 @@ namespace Content.Server.GameTicking
             _cardSystem.TryChangeFullName(card.Owner.Uid, characterName, card);
             _cardSystem.TryChangeJobTitle(card.Owner.Uid, jobPrototype.Name, card);
 
-            var access = card.Owner.GetComponent<AccessComponent>();
+            var access = IoCManager.Resolve<IEntityManager>().GetComponent<AccessComponent>(card.Owner.Uid);
             var accessTags = access.Tags;
             accessTags.UnionWith(jobPrototype.Access);
             EntityManager.EntitySysManager.GetEntitySystem<PDASystem>()

Content.Server/GameTicking/Presets/GamePreset.cs

@@ -82,7 +82,7 @@ namespace Content.Server.GameTicking.Presets
             else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
                 ghost.Name = mind.Session.Name;
 
-            var ghostComponent = ghost.GetComponent<GhostComponent>();
+            var ghostComponent = IoCManager.Resolve<IEntityManager>().GetComponent<GhostComponent>(ghost.Uid);
 
             if (mind.TimeOfDeath.HasValue)
             {

Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs

@@ -93,15 +93,15 @@ namespace Content.Server.GameTicking.Presets
 
                 //  pda
                 var newPDA = _entityManager.SpawnEntity(PDAPrototypeName, mind.OwnedEntity.Transform.Coordinates);
-                inventory.Equip(EquipmentSlotDefines.Slots.IDCARD, newPDA.GetComponent<ItemComponent>());
+                inventory.Equip(EquipmentSlotDefines.Slots.IDCARD, IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(newPDA.Uid));
 
                 //  belt
                 var newTmp = _entityManager.SpawnEntity(BeltPrototypeName, mind.OwnedEntity.Transform.Coordinates);
-                inventory.Equip(EquipmentSlotDefines.Slots.BELT, newTmp.GetComponent<ItemComponent>());
+                inventory.Equip(EquipmentSlotDefines.Slots.BELT, IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(newTmp.Uid));
 
                 //  backpack
                 newTmp = _entityManager.SpawnEntity(BackpackPrototypeName, mind.OwnedEntity.Transform.Coordinates);
-                inventory.Equip(EquipmentSlotDefines.Slots.BACKPACK, newTmp.GetComponent<ItemComponent>());
+                inventory.Equip(EquipmentSlotDefines.Slots.BACKPACK, IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(newTmp.Uid));
 
                 // Like normal traitors, they need access to a traitor account.
                 var uplinkAccount = new UplinkAccount(startingBalance, mind.OwnedEntity.Uid);
@@ -114,7 +114,7 @@ namespace Content.Server.GameTicking.Presets
                 _allOriginalNames[uplinkAccount] = mind.OwnedEntity.Name;
 
                 // The PDA needs to be marked with the correct owner.
-                var pda = newPDA.GetComponent<PDAComponent>();
+                var pda = IoCManager.Resolve<IEntityManager>().GetComponent<PDAComponent>(newPDA.Uid);
                 _entityManager.EntitySysManager.GetEntitySystem<PDASystem>()
                     .SetOwner(pda, mind.OwnedEntity.Name);
                 IoCManager.Resolve<IEntityManager>().AddComponent<TraitorDeathMatchReliableOwnerTagComponent>(newPDA).UserId = mind.UserId;

Content.Server/Gravity/EntitySystems/WeightlessSystem.cs

@@ -42,7 +42,7 @@ namespace Content.Server.Gravity.EntitySystems
             if (_mapManager.TryGetGrid(status.Owner.Transform.GridID, out var grid))
             {
                 var gridEntity = EntityManager.GetEntity(grid.GridEntityId);
-                if (gridEntity.GetComponent<GravityComponent>().Enabled)
+                if (IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(gridEntity.Uid).Enabled)
                 {
                     RemoveWeightless(status);
                 }

Content.Server/Hands/Systems/HandVirtualItemSystem.cs

@@ -34,7 +34,7 @@ namespace Content.Server.Hands.Systems
 
                     var pos = hands.Owner.Transform.Coordinates;
                     var virtualItem = EntityManager.SpawnEntity("HandVirtualItem", pos);
-                    var virtualItemComp = virtualItem.GetComponent<HandVirtualItemComponent>();
+                    var virtualItemComp = IoCManager.Resolve<IEntityManager>().GetComponent<HandVirtualItemComponent>(virtualItem.Uid);
                     virtualItemComp.BlockingEntity = blockingEnt;
                     hands.PutEntityIntoHand(hand, virtualItem);
                     return true;

Content.Server/Inventory/Components/HumanInventoryControllerComponent.cs

@@ -3,6 +3,7 @@ using Content.Server.Items;
 using Content.Shared.Item;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using static Content.Shared.Inventory.EquipmentSlotDefines;
 
@@ -42,7 +43,7 @@ namespace Content.Server.Inventory.Components
 
                 if (slotMask == SlotFlags.POCKET)
                 {
-                    var itemComponent = entity.GetComponent<ItemComponent>();
+                    var itemComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(entity.Uid);
 
                     // If this item is small enough then it always fits in pockets.
                     if (itemComponent.Size <= (int) ReferenceSizes.Pocket)