From 3c7c2cd7c116c3394ac2fe591ba3168b5cff2a9c Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 15 Aug 2022 08:17:50 +1200
Subject: [PATCH] Fix IoCManager test error (#10597)

---
 Content.Server/Entry/EntryPoint.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 360f49e7de..3a54c8a15c 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -41,6 +41,7 @@ namespace Content.Server.Entry
         private IVoteManager _voteManager = default!;
         private ServerUpdateManager _updateManager = default!;
         private PlayTimeTrackingManager? _playTimeTracking;
+        private IEntitySystemManager? _sysMan;
 
         /// <inheritdoc />
         public override void Init()
@@ -81,6 +82,7 @@ namespace Content.Server.Entry
                 _voteManager = IoCManager.Resolve<IVoteManager>();
                 _updateManager = IoCManager.Resolve<ServerUpdateManager>();
                 _playTimeTracking = IoCManager.Resolve<PlayTimeTrackingManager>();
+                _sysMan = IoCManager.Resolve<IEntitySystemManager>();
 
                 var logManager = IoCManager.Resolve<ILogManager>();
                 logManager.GetSawmill("Storage").Level = LogLevel.Info;
@@ -161,7 +163,7 @@ namespace Content.Server.Entry
         protected override void Dispose(bool disposing)
         {
             _playTimeTracking?.Shutdown();
-            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<StationSystem>().OnServerDispose();
+            _sysMan?.GetEntitySystemOrNull<StationSystem>()?.OnServerDispose();
         }
     }
 }