Inline TryGetComponent completely, for real

2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
--- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
@@ -1,4 +1,5 @@
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;

 namespace Content.Shared.CombatMode
 {
@@ -16,7 +17,7 @@ namespace Content.Shared.CombatMode
        {
            var entity = eventArgs.SenderSession?.AttachedEntity;

-            if (entity == null || !entity.TryGetComponent(out SharedCombatModeComponent? combatModeComponent))
+            if (entity == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out SharedCombatModeComponent? combatModeComponent))
            {
                return;
            }