Add pausedMap checks to lost and found systems instead

Simple-Station · Feb 21, 2024 · 3d05478 · 3d05478
1 parent 8f80035
commit 3d05478
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 50 deletions.
diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
@@ -121,8 +121,8 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
         // play the cryostasis sound effect; need to use coordinates since the body gets deleted
         _audio.PlayPvs("/Audio/SimpleStation14/Effects/cryostasis.ogg", Transform(ent).Coordinates, AudioParams.Default.WithVolume(6f));
 
-        EnsurePausedMap();
-        if (PausedMap == null)
+        _lostAndFound.EnsurePausedMap();
+        if (_lostAndFound.PausedMap == null)
         {
             Log.Error("CryoSleep map was unexpectedly null");
             return;
@@ -136,7 +136,7 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
             }
         }
         comp.AllowReEnteringBody = false;
-        _transform.SetParent(ent, PausedMap.Value);
+        _transform.SetParent(ent, _lostAndFound.PausedMap.Value);
 
         // try to get the lost and found and add the player to it
         var query = EntityQueryEnumerator<LostAndFoundComponent>();
@@ -156,7 +156,7 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
     private void HandleCryostorageReconnection(Entity<CryostorageContainedComponent> entity)
     {
         var (uid, comp) = entity;
-        if (!CryoSleepRejoiningEnabled || !IsInPausedMap(uid))
+        if (!CryoSleepRejoiningEnabled || !_lostAndFound.IsInPausedMap(uid))
             return;
 
         // how did you destroy these? they're indestructible.

diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
@@ -1,14 +1,12 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.CCVar;
 using Content.Shared.DragDrop;
-using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Bed.Cryostorage;
@@ -21,13 +19,10 @@ public abstract class SharedCryostorageSystem : EntitySystem
     [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!;
     [Dependency] private readonly IConfigurationManager _configuration = default!;
     [Dependency] protected readonly IGameTiming Timing = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] protected readonly SharedMindSystem Mind = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
 
-    protected EntityUid? PausedMap { get; private set; }
-
     protected bool CryoSleepRejoiningEnabled;
 
     /// <inheritdoc/>
@@ -38,11 +33,9 @@ public override void Initialize()
         SubscribeLocalEvent<CryostorageComponent, ContainerIsInsertingAttemptEvent>(OnInsertAttempt);
         SubscribeLocalEvent<CryostorageComponent, CanDropTargetEvent>(OnCanDropTarget);
 
-        SubscribeLocalEvent<CryostorageContainedComponent, EntGotRemovedFromContainerMessage>(OnRemovedContained);
         SubscribeLocalEvent<CryostorageContainedComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<CryostorageContainedComponent, ComponentShutdown>(OnShutdownContained);
 
-        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
 
         _configuration.OnValueChanged(CCVars.GameCryoSleepRejoining, OnCvarChanged, true);
     }
@@ -122,12 +115,6 @@ private void OnCanDropTarget(Entity<CryostorageComponent> ent, ref CanDropTarget
         args.Handled = true;
     }
 
-    private void OnRemovedContained(Entity<CryostorageContainedComponent> ent, ref EntGotRemovedFromContainerMessage args)
-    {
-        var (uid, comp) = ent;
-        if (!IsInPausedMap(uid))
-            RemCompDeferred(ent, comp);
-    }
 
     private void OnUnpaused(Entity<CryostorageContainedComponent> ent, ref EntityUnpausedEvent args)
     {
@@ -148,36 +135,4 @@ private void OnShutdownContained(Entity<CryostorageContainedComponent> ent, ref
         ent.Comp.Cryostorage = null;
         Dirty(ent, comp);
     }
-
-    private void OnRoundRestart(RoundRestartCleanupEvent _)
-    {
-        DeletePausedMap();
-    }
-
-    private void DeletePausedMap()
-    {
-        if (PausedMap == null || !Exists(PausedMap))
-            return;
-
-        EntityManager.DeleteEntity(PausedMap.Value);
-        PausedMap = null;
-    }
-
-    protected void EnsurePausedMap()
-    {
-        if (PausedMap != null && Exists(PausedMap))
-            return;
-
-        var map = _mapManager.CreateMap();
-        _mapManager.SetMapPaused(map, true);
-        PausedMap = _mapManager.GetMapEntityId(map);
-    }
-
-    public bool IsInPausedMap(Entity<TransformComponent?> entity)
-    {
-        var (_, comp) = entity;
-        comp ??= Transform(entity);
-
-        return comp.MapUid != null && comp.MapUid == PausedMap;
-    }
 }
diff --git a/Content.Shared/Bed/Cryostorage/SharedLostAndFoundSystem.cs b/Content.Shared/Bed/Cryostorage/SharedLostAndFoundSystem.cs
@@ -1,4 +1,7 @@
 using Content.Shared.Administration.Logs;
+using Content.Shared.GameTicking;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
 
 namespace Content.Shared.Bed.Cryostorage;
 
@@ -8,13 +11,17 @@ namespace Content.Shared.Bed.Cryostorage;
 public abstract class SharedLostAndFoundSystem : EntitySystem
 {
     [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
 
-    protected EntityUid? PausedMap { get; private set; }
+    public EntityUid? PausedMap { get; private set; }
 
     /// <inheritdoc/>
     public override void Initialize()
     {
         SubscribeLocalEvent<LostAndFoundComponent, ComponentShutdown>(OnShutdownContainer);
+        SubscribeLocalEvent<LostAndFoundComponent, EntGotRemovedFromContainerMessage>(OnRemovedContained);
+
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
     }
 
     private void OnShutdownContainer(Entity<LostAndFoundComponent> ent, ref ComponentShutdown args)
@@ -40,4 +47,35 @@ public bool IsInPausedMap(Entity<TransformComponent?> entity)
 
         return comp.MapUid != null && comp.MapUid == PausedMap;
     }
+
+    private void OnRemovedContained(Entity<LostAndFoundComponent> ent, ref EntGotRemovedFromContainerMessage args)
+    {
+        var (uid, comp) = ent;
+        if (!IsInPausedMap(uid))
+            RemCompDeferred(ent, comp);
+    }
+
+    private void OnRoundRestart(RoundRestartCleanupEvent _)
+    {
+        DeletePausedMap();
+    }
+
+    private void DeletePausedMap()
+    {
+        if (PausedMap == null || !Exists(PausedMap))
+            return;
+
+        EntityManager.DeleteEntity(PausedMap.Value);
+        PausedMap = null;
+    }
+
+    public void EnsurePausedMap()
+    {
+        if (PausedMap != null && Exists(PausedMap))
+            return;
+
+        var map = _mapManager.CreateMap();
+        _mapManager.SetMapPaused(map, true);
+        PausedMap = _mapManager.GetMapEntityId(map);
+    }
 }