From c4895af81a5d21842f47df7b3ee16ddec223d04e Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Sat, 3 Apr 2021 00:52:27 -0700
Subject: [PATCH] Add shutdown and clean up GhostSystem

---
 .../GameObjects/EntitySystems/GhostSystem.cs          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Content.Server/GameObjects/EntitySystems/GhostSystem.cs b/Content.Server/GameObjects/EntitySystems/GhostSystem.cs
index df704048ab..4cdd06c0ba 100644
--- a/Content.Server/GameObjects/EntitySystems/GhostSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/GhostSystem.cs
@@ -1,10 +1,7 @@
-#nullable enable
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Observer;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
-using System;
 
 namespace Content.Server.GameObjects.EntitySystems
 {
@@ -19,6 +16,14 @@ namespace Content.Server.GameObjects.EntitySystems
             SubscribeLocalEvent<GhostComponent, MindUnvisitedMessage>(OnMindUnvisitedMessage);
         }
 
+        public override void Shutdown()
+        {
+            base.Shutdown();
+
+            UnsubscribeLocalEvent<GhostComponent, MindRemovedMessage>(OnMindRemovedMessage);
+            UnsubscribeLocalEvent<GhostComponent, MindUnvisitedMessage>(OnMindUnvisitedMessage);
+        }
+
         private void OnMindRemovedMessage(EntityUid uid, GhostComponent component, MindRemovedMessage args)
         {
             if (!EntityManager.TryGetEntity(uid, out var entity))