Inline GetComponentOrNull

Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs

@@ -18,7 +18,7 @@ namespace Content.Client.Kitchen.Visualizers
             base.OnChangeData(component);
             var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
 
-            var microwaveComponent = component.Owner.GetComponentOrNull<MicrowaveComponent>();
+            var microwaveComponent = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<MicrowaveComponent>(component.Owner.Uid);
 
             if (!component.TryGetData(PowerDeviceVisuals.VisualState, out MicrowaveVisualState state))
             {

Content.Client/Smoking/BurnStateVisualizer.cs

@@ -3,6 +3,7 @@ using Content.Shared.Smoking;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Smoking
@@ -38,7 +39,7 @@ namespace Content.Client.Smoking
 
         private void SetState(AppearanceComponent component, SmokableState burnState)
         {
-            var clothing = component.Owner.GetComponentOrNull<ClothingComponent>();
+            var clothing = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ClothingComponent>(component.Owner.Uid);
 
             if (component.Owner.TryGetComponent<ISpriteComponent>(out var sprite))
             {

Content.Server/Atmos/Components/GasTankComponent.cs

@@ -231,9 +231,9 @@ namespace Content.Server.Atmos.Components
         private InternalsComponent? GetInternalsComponent(IEntity? owner = null)
         {
             if ((!IoCManager.Resolve<IEntityManager>().EntityExists(Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted) return null;
-            if (owner != null) return owner.GetComponentOrNull<InternalsComponent>();
+            if (owner != null) return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<InternalsComponent>(owner.Uid);
             return Owner.TryGetContainer(out var container)
-                ? container.Owner.GetComponentOrNull<InternalsComponent>()
+                ? IoCManager.Resolve<IEntityManager>().GetComponentOrNull<InternalsComponent>(container.Owner.Uid)
                 : null;
         }
 

Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs

@@ -88,7 +88,7 @@ namespace Content.Server.Atmos.EntitySystems
 
                 var uid = barotrauma.Owner.Uid;
 
-                var status = barotrauma.Owner.GetComponentOrNull<ServerAlertsComponent>();
+                var status = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ServerAlertsComponent>(barotrauma.Owner.Uid);
 
                 var pressure = 1f;
 

Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs

@@ -28,7 +28,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
 
         private void OnGasDualPortVentPumpUpdated(EntityUid uid, GasDualPortVentPumpComponent vent, AtmosDeviceUpdateEvent args)
         {
-            var appearance = vent.Owner.GetComponentOrNull<AppearanceComponent>();
+            var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(vent.Owner.Uid);
 
             if (vent.Welded)
             {

Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs

@@ -50,7 +50,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
 
         private void OnPumpUpdated(EntityUid uid, GasPressurePumpComponent pump, AtmosDeviceUpdateEvent args)
         {
-            var appearance = pump.Owner.GetComponentOrNull<AppearanceComponent>();
+            var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(pump.Owner.Uid);
 
             if (!pump.Enabled
                 || !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)

Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs

@@ -38,7 +38,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
 
         private void OnFilterUpdated(EntityUid uid, GasFilterComponent filter, AtmosDeviceUpdateEvent args)
         {
-            var appearance = filter.Owner.GetComponentOrNull<AppearanceComponent>();
+            var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(filter.Owner.Uid);
 
             if (!filter.Enabled
             || !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)

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

@@ -25,7 +25,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent thermoMachine, AtmosDeviceUpdateEvent args)
         {
-            var appearance = thermoMachine.Owner.GetComponentOrNull<AppearanceComponent>();
+            var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(thermoMachine.Owner.Uid);
 
             if (!thermoMachine.Enabled
                 || !EntityManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer)

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

@@ -27,7 +27,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnGasVentPumpUpdated(EntityUid uid, GasVentPumpComponent vent, AtmosDeviceUpdateEvent args)
         {
-            var appearance = vent.Owner.GetComponentOrNull<AppearanceComponent>();
+            var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(vent.Owner.Uid);
 
             if (vent.Welded)
             {

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

@@ -28,7 +28,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnVentScrubberUpdated(EntityUid uid, GasVentScrubberComponent scrubber, AtmosDeviceUpdateEvent args)
         {
-            var appearance = scrubber.Owner.GetComponentOrNull<AppearanceComponent>();
+            var appearance = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AppearanceComponent>(scrubber.Owner.Uid);
 
             if (scrubber.Welded)
             {

Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs

@@ -31,7 +31,7 @@ namespace Content.Server.Body.Surgery
 
         private bool VesselsClamped { get; set; }
 
-        public SharedBodyPartComponent? Parent => Owner.GetComponentOrNull<SharedBodyPartComponent>();
+        public SharedBodyPartComponent? Parent => IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SharedBodyPartComponent>(Owner.Uid);
 
         public BodyPartType? ParentType => Parent?.PartType;
 

Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs

@@ -1,6 +1,7 @@
 using Content.Server.Chemistry.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Chemistry.ReactionEffects
@@ -11,7 +12,7 @@ namespace Content.Server.Chemistry.ReactionEffects
     {
         protected override SolutionAreaEffectComponent? GetAreaEffectComponent(IEntity entity)
         {
-            return entity.GetComponentOrNull<FoamSolutionAreaEffectComponent>();
+            return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<FoamSolutionAreaEffectComponent>(entity.Uid);
         }
     }
 }

Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs

@@ -1,6 +1,7 @@
 using Content.Server.Chemistry.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Chemistry.ReactionEffects
@@ -11,7 +12,7 @@ namespace Content.Server.Chemistry.ReactionEffects
     {
         protected override SolutionAreaEffectComponent? GetAreaEffectComponent(IEntity entity)
         {
-            return entity.GetComponentOrNull<SmokeSolutionAreaEffectComponent>();
+            return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SmokeSolutionAreaEffectComponent>(entity.Uid);
         }
     }
 }

Content.Server/Cuffs/CuffableSystem.cs

@@ -105,7 +105,7 @@ namespace Content.Server.Cuffs
                 !cuffable.Initialized) return;
 
             var dirty = false;
-            var handCount = owner.GetComponentOrNull<HandsComponent>()?.Count ?? 0;
+            var handCount = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<HandsComponent>(owner.Uid)?.Count ?? 0;
 
             while (cuffable.CuffedHandCount > handCount && cuffable.CuffedHandCount > 0)
             {

Content.Server/Instruments/InstrumentComponent.cs

@@ -3,6 +3,7 @@ using Content.Shared.Instruments;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Instruments;
@@ -23,8 +24,8 @@ public sealed class InstrumentComponent : SharedInstrumentComponent
     public int MidiEventCount = 0;
 
     public IPlayerSession? InstrumentPlayer =>
-        Owner.GetComponentOrNull<ActivatableUIComponent>()?.CurrentSingleUser
+        IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ActivatableUIComponent>(Owner.Uid)?.CurrentSingleUser
-        ?? Owner.GetComponentOrNull<ActorComponent>()?.PlayerSession;
+        ?? IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ActorComponent>(Owner.Uid)?.PlayerSession;
 
     [ViewVariables] public BoundUserInterface? UserInterface => Owner.GetUIOrNull(InstrumentUiKey.Key);
 }

Content.Server/Inventory/Components/InventoryComponent.cs

@@ -112,7 +112,7 @@ namespace Content.Server.Inventory.Components
         public IEnumerable<T?> LookupItems<T>() where T : Component
         {
             return _slotContainers.Values
-                .SelectMany(x => x.ContainedEntities.Select(e => e.GetComponentOrNull<T>()))
+                .SelectMany(x => x.ContainedEntities.Select(e => IoCManager.Resolve<IEntityManager>().GetComponentOrNull<T>(e.Uid)))
                 .Where(x => x != null);
         }
 

Content.Server/Light/EntitySystems/LightReplacerSystem.cs

@@ -107,7 +107,7 @@ namespace Content.Server.Light.EntitySystems
 
             // try get first inserted bulb of the same type as targeted light fixtutre
             var bulb = replacer.InsertedBulbs.ContainedEntities.FirstOrDefault(
-                (e) => e.GetComponentOrNull<LightBulbComponent>()?.Type == fixture.BulbType);
+                (e) => IoCManager.Resolve<IEntityManager>().GetComponentOrNull<LightBulbComponent>(e.Uid)?.Type == fixture.BulbType);
 
             // found bulb in inserted storage
             if (bulb != null)

Content.Server/Medical/Components/MedicalScannerComponent.cs

@@ -137,7 +137,7 @@ namespace Content.Server.Medical.Components
                 if (body == null)
                     return MedicalScannerStatus.Open;
 
-                var state = body.GetComponentOrNull<MobStateComponent>();
+                var state = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<MobStateComponent>(body.Uid);
 
                 return state == null ? MedicalScannerStatus.Open : GetStatusFromDamageState(state);
             }

Content.Server/Mind/Mind.cs

@@ -155,7 +155,7 @@ namespace Content.Server.Mind
                 // This can be null if they're deleted (spike / brain nom)
                 if (OwnedEntity == null)
                     return true;
-                var targetMobState = OwnedEntity.GetComponentOrNull<MobStateComponent>();
+                var targetMobState = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<MobStateComponent>(OwnedEntity.Uid);
                 // This can be null if it's a brain (this happens very often)
                 // Brains are the result of gibbing so should definitely count as dead
                 if (targetMobState == null)

Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs

@@ -20,7 +20,11 @@ namespace Content.Server.Objectives.Conditions
             var allHumans = entityMgr.EntityQuery<MindComponent>(true).Where(mc =>
             {
                 var entity = mc.Mind?.OwnedEntity;
-                return (entity?.GetComponentOrNull<MobStateComponent>()?.IsAlive() ?? false) && mc.Mind != mind;
+
+                if (entity == null)
+                    return false;
+
+                return (IoCManager.Resolve<IEntityManager>().GetComponentOrNull<MobStateComponent>(entity.Uid)?.IsAlive() ?? false) && mc.Mind != mind;
             }).Select(mc => mc.Mind).ToList();
             return new KillRandomPersonCondition {Target = IoCManager.Resolve<IRobustRandom>().Pick(allHumans)};
         }

Content.Server/PDA/PDASystem.cs

@@ -73,7 +73,7 @@ namespace Content.Server.PDA
         private void OnItemInserted(EntityUid uid, PDAComponent pda, EntInsertedIntoContainerMessage args)
         {
             if (args.Container.ID == pda.IdSlot.ID)
-                pda.ContainedID = args.Entity.GetComponentOrNull<IdCardComponent>();
+                pda.ContainedID = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<IdCardComponent>(args.Entity.Uid);
 
             UpdatePDAAppearance(pda);
             UpdatePDAUserInterface(pda);

Content.Server/Storage/EntitySystems/StorageSystem.cs

@@ -91,7 +91,7 @@ namespace Content.Server.Storage.EntitySystems
                 return;
 
             // Get the session for the user
-            var session = args.User.GetComponentOrNull<ActorComponent>()?.PlayerSession;
+            var session = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ActorComponent>(args.User.Uid)?.PlayerSession;
             if (session == null)
                 return;
 

Content.Server/UserInterface/UserInterfaceHelpers.cs

@@ -1,5 +1,6 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
 namespace Content.Server.UserInterface
 {
@@ -7,7 +8,7 @@ namespace Content.Server.UserInterface
     {
         public static BoundUserInterface? GetUIOrNull(this IEntity entity, object uiKey)
         {
-            return entity.GetComponentOrNull<ServerUserInterfaceComponent>()?.GetBoundUserInterfaceOrNull(uiKey);
+            return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ServerUserInterfaceComponent>(entity.Uid)?.GetBoundUserInterfaceOrNull(uiKey);
         }
     }
 }

Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs

@@ -192,7 +192,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
             if (chamberEntity == null)
                 return null;
 
-            return chamberEntity.GetComponentOrNull<AmmoComponent>()?.TakeBullet(spawnAt);
+            return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AmmoComponent>(chamberEntity.Uid)?.TakeBullet(spawnAt);
         }
 
         protected override bool WeaponCanFire()

Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs

@@ -149,6 +149,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
         public override IEntity? TakeProjectile(EntityCoordinates spawnAt)
         {
             var chamberEntity = _chamberContainer.ContainedEntity;
+
             if (!_manualCycle)
             {
                 Cycle();
@@ -158,7 +159,10 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
                 Dirty();
             }
 
-            return chamberEntity?.GetComponentOrNull<AmmoComponent>()?.TakeBullet(spawnAt);
+            if (chamberEntity == null)
+                return null;
+
+            return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<AmmoComponent>(chamberEntity.Uid)?.TakeBullet(spawnAt);
         }
 
         private void Cycle(bool manual = false)

Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs

@@ -36,7 +36,17 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
         [ViewVariables] private string? _ammoPrototype;
 
         [ViewVariables] public IEntity? PowerCellEntity => _powerCellContainer.ContainedEntity;
-        public BatteryComponent? PowerCell => _powerCellContainer.ContainedEntity?.GetComponentOrNull<BatteryComponent>();
+        public BatteryComponent? PowerCell
+        {
+            get
+            {
+                if (_powerCellContainer.ContainedEntity == null)
+                    return null;
+
+                return _powerCellContainer.ContainedEntity.GetComponentOrNull<BatteryComponent>();
+            }
+        }
+
         private ContainerSlot _powerCellContainer = default!;
         private ContainerSlot _ammoContainer = default!;
         [DataField("powerCellPrototype")]

Content.Shared/Body/Components/SharedBodyPartComponent.cs

@@ -110,7 +110,7 @@ namespace Content.Shared.Body.Components
         public BodyPartSymmetry Symmetry { get; private set; } = BodyPartSymmetry.None;
 
         [ViewVariables]
-        public ISurgeryData? SurgeryDataComponent => Owner.GetComponentOrNull<ISurgeryData>();
+        public ISurgeryData? SurgeryDataComponent => IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ISurgeryData>(Owner.Uid);
 
         protected virtual void OnAddMechanism(SharedMechanismComponent mechanism)
         {

Content.Shared/Friction/SharedTileFrictionController.cs

@@ -59,7 +59,7 @@ namespace Content.Shared.Friction
                     Mover.UseMobMovement(body.OwnerUid)) continue;
 
                 var surfaceFriction = GetTileFriction(body);
-                var bodyModifier = body.Owner.GetComponentOrNull<SharedTileFrictionModifier>()?.Modifier ?? 1.0f;
+                var bodyModifier = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SharedTileFrictionModifier>(body.Owner.Uid)?.Modifier ?? 1.0f;
                 var friction = _frictionModifier * surfaceFriction * bodyModifier;
 
                 ReduceLinearVelocity(prediction, body, friction, frameTime);

Content.Shared/MobState/Components/MobStateComponent.cs

@@ -60,7 +60,7 @@ namespace Content.Shared.MobState.Components
             else
             {
                 // Initialize with some amount of damage, defaulting to 0.
-                UpdateState(Owner.GetComponentOrNull<DamageableComponent>()?.TotalDamage ?? FixedPoint2.Zero);
+                UpdateState(IoCManager.Resolve<IEntityManager>().GetComponentOrNull<DamageableComponent>(Owner.Uid)?.TotalDamage ?? FixedPoint2.Zero);
             }
         }
 

Content.Shared/Singularity/SharedSingularitySystem.cs

@@ -55,7 +55,7 @@ namespace Content.Shared.Singularity
 
             value = Math.Clamp(value, 0, 6);
 
-            var physics = singularity.Owner.GetComponentOrNull<PhysicsComponent>();
+            var physics = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<PhysicsComponent>(singularity.Owner.Uid);
 
             if (singularity.Level > 1 && value <= 1)
             {