diff --git a/Content.Client/Atmos/Visualizers/PipeColorVisualizer.cs b/Content.Client/Atmos/Visualizers/PipeColorVisualizer.cs index 7994a2b7de..f364401514 100644 --- a/Content.Client/Atmos/Visualizers/PipeColorVisualizer.cs +++ b/Content.Client/Atmos/Visualizers/PipeColorVisualizer.cs @@ -2,6 +2,7 @@ using Content.Shared.Atmos.Piping; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Maths; namespace Content.Client.Atmos.Visualizers @@ -13,7 +14,7 @@ namespace Content.Client.Atmos.Visualizers { base.OnChangeData(component); - if (!component.Owner.TryGetComponent(out SpriteComponent? sprite)) + if (!IoCManager.Resolve().TryGetComponent(component.OwnerUid, out SpriteComponent? sprite)) return; if (component.TryGetData(PipeColorVisuals.Color, out Color color)) diff --git a/Content.Client/Storage/ClientStorageComponent.cs b/Content.Client/Storage/ClientStorageComponent.cs index 9f72156410..f6572880ac 100644 --- a/Content.Client/Storage/ClientStorageComponent.cs +++ b/Content.Client/Storage/ClientStorageComponent.cs @@ -252,7 +252,7 @@ namespace Content.Client.Storage { var controlledEntity = IoCManager.Resolve().LocalPlayer?.ControlledEntity; - if (controlledEntity?.TryGetComponent(out HandsComponent? hands) ?? false) + if (controlledEntity != null && controlledEntity.TryGetComponent(out HandsComponent? hands)) { #pragma warning disable 618 StorageEntity.SendNetworkMessage(new InsertEntityMessage()); diff --git a/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs b/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs index e999c172f2..790d5db937 100644 --- a/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs +++ b/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs @@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.Combat { var target = context.GetState().GetValue(); - if (target == null || (!IoCManager.Resolve().EntityExists(target.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(target.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !target.TryGetComponent(out DamageableComponent? damageableComponent)) + if (target == null || !IoCManager.Resolve().EntityExists(target.Uid) || !target.TryGetComponent(out DamageableComponent? damageableComponent)) { return 0.0f; } diff --git a/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs b/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs index eb3210b6d2..05be51230a 100644 --- a/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs +++ b/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs @@ -13,8 +13,9 @@ namespace Content.Server.AI.Utility.Considerations.Nutrition.Food { var target = context.GetState().GetValue(); - if (target == null || (!IoCManager.Resolve().EntityExists(target.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(target.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !target.TryGetComponent(out var foodComp) || - !EntitySystem.Get().TryGetSolution(target.Uid, foodComp.SolutionName, out var food)) + if (target == null || !IoCManager.Resolve().EntityExists(target.Uid) + || !target.TryGetComponent(out var foodComp) + || !EntitySystem.Get().TryGetSolution(target.Uid, foodComp.SolutionName, out var food)) { return 0.0f; } diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs index 244ce6b4c2..f515bf37aa 100644 --- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs @@ -51,7 +51,7 @@ namespace Content.Server.DeviceNetwork.Systems /// The Entity containing a DeviceNetworkComponent public void Connect(EntityUid uid) { - if (EntityManager.GetEntity(uid).TryGetComponent(out var component)) + if (EntityManager.TryGetComponent(uid, out var component)) { AddConnection(component); } @@ -90,7 +90,7 @@ namespace Content.Server.DeviceNetwork.Systems /// The Entity containing a DeviceNetworkComponent public void Disconnect(EntityUid uid) { - if (EntityManager.GetEntity(uid).TryGetComponent(out var component)) + if (EntityManager.TryGetComponent(uid, out var component)) { RemoveConnection(component); } diff --git a/Content.Server/Light/Components/EmergencyLightComponent.cs b/Content.Server/Light/Components/EmergencyLightComponent.cs index 4943057884..c05946b13f 100644 --- a/Content.Server/Light/Components/EmergencyLightComponent.cs +++ b/Content.Server/Light/Components/EmergencyLightComponent.cs @@ -80,7 +80,7 @@ namespace Content.Server.Light.Components public void OnUpdate(float frameTime) { - if ((!IoCManager.Resolve().EntityExists(Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !Owner.TryGetComponent(out BatteryComponent? battery) || ((!IoCManager.Resolve().EntityExists(Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || IoCManager.Resolve().GetComponent(Owner.Uid).EntityPaused)) + if ((!IoCManager.Resolve().EntityExists(Owner.Uid) || !Owner.TryGetComponent(out BatteryComponent? battery) || IoCManager.Resolve().GetComponent(Owner.Uid).EntityPaused)) { return; } diff --git a/Content.Server/Medical/Components/MedicalScannerComponent.cs b/Content.Server/Medical/Components/MedicalScannerComponent.cs index 413dca3fb8..4a169bd3df 100644 --- a/Content.Server/Medical/Components/MedicalScannerComponent.cs +++ b/Content.Server/Medical/Components/MedicalScannerComponent.cs @@ -134,11 +134,12 @@ namespace Content.Server.Medical.Components if (Powered) { var body = _bodyContainer.ContainedEntity; - var state = body?.GetComponentOrNull(); + if (body == null) + return MedicalScannerStatus.Open; - return state == null - ? MedicalScannerStatus.Open - : GetStatusFromDamageState(state); + var state = body.GetComponentOrNull(); + + return state == null ? MedicalScannerStatus.Open : GetStatusFromDamageState(state); } return MedicalScannerStatus.Off; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs index d614934221..ea60dbb6d2 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs @@ -189,7 +189,10 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components Dirty(); } - return chamberEntity?.GetComponentOrNull()?.TakeBullet(spawnAt); + if (chamberEntity == null) + return null; + + return chamberEntity.GetComponentOrNull()?.TakeBullet(spawnAt); } protected override bool WeaponCanFire() diff --git a/Content.Server/WireHacking/WiresComponent.cs b/Content.Server/WireHacking/WiresComponent.cs index ab419859c3..330735b78a 100644 --- a/Content.Server/WireHacking/WiresComponent.cs +++ b/Content.Server/WireHacking/WiresComponent.cs @@ -430,7 +430,8 @@ namespace Content.Server.WireHacking var activeHandEntity = handsComponent.GetActiveHand?.Owner; ToolComponent? tool = null; - activeHandEntity?.TryGetComponent(out tool); + if(activeHandEntity != null) + activeHandEntity.TryGetComponent(out tool); var toolSystem = EntitySystem.Get(); switch (msg.Action) diff --git a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs index 0555adab15..4190b92517 100644 --- a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs @@ -62,7 +62,7 @@ namespace Content.Shared.Nutrition.EntitySystems private void OnCreamPiedHitBy(EntityUid uid, CreamPiedComponent creamPied, ThrowHitByEvent args) { - if ((!IoCManager.Resolve().EntityExists(args.Thrown.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(args.Thrown.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !args.Thrown.TryGetComponent(out CreamPieComponent? creamPie)) return; + if (!IoCManager.Resolve().EntityExists(args.Thrown.Uid) || !args.Thrown.TryGetComponent(out CreamPieComponent? creamPie)) return; SetCreamPied(uid, creamPied, true);