Makes a lot of entity systems unsubscribe from events on shutdown.

2021-04-09 16:08:12 +02:00
parent c28f22ebff
commit 03cd390478
15 changed files with 119 additions and 28 deletions
--- a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs
@@ -51,8 +51,12 @@ namespace Content.Server.GameObjects.EntitySystems
        /// <inheritdoc />
        public override void Shutdown()
        {
-            CommandBinds.Unregister<HandsSystem>();
            base.Shutdown();
+
+            UnsubscribeLocalEvent<EntRemovedFromContainerMessage>();
+            UnsubscribeLocalEvent<EntInsertedIntoContainerMessage>();
+
+            CommandBinds.Unregister<HandsSystem>();
        }

        private static void HandleContainerModified(ContainerModifiedMessage args)