From 9b28aedbc560f402db36275b6cadd7c3094f13a3 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Wed, 26 Mar 2025 10:17:28 -0400 Subject: [PATCH] Cleanup TabletopSystem.Map (#36097) * Add SharedMapSystem dependency * IMapManager.MapExists -> SharedMapSystem.MapExists * IMapManager.CreateMap & IMapManager.GetMapEntityId -> SharedMapSystem.CreateMap * IMapManager.DeleteMap -> SharedMapSystem.DeleteMap * Remove IMapManager dependency --- Content.Server/Tabletop/TabletopSystem.Map.cs | 10 +++++----- Content.Server/Tabletop/TabletopSystem.cs | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Content.Server/Tabletop/TabletopSystem.Map.cs b/Content.Server/Tabletop/TabletopSystem.Map.cs index 362fbc5550..837ab2df24 100644 --- a/Content.Server/Tabletop/TabletopSystem.Map.cs +++ b/Content.Server/Tabletop/TabletopSystem.Map.cs @@ -45,12 +45,12 @@ namespace Content.Server.Tabletop /// private void EnsureTabletopMap() { - if (TabletopMap != MapId.Nullspace && _mapManager.MapExists(TabletopMap)) + if (TabletopMap != MapId.Nullspace && _map.MapExists(TabletopMap)) return; - TabletopMap = _mapManager.CreateMap(); + var mapUid = _map.CreateMap(out var mapId); + TabletopMap = mapId; _tabletops = 0; - var mapUid = _mapManager.GetMapEntityId(TabletopMap); var mapComp = EntityManager.GetComponent(mapUid); @@ -89,11 +89,11 @@ namespace Content.Server.Tabletop private void OnRoundRestart(RoundRestartCleanupEvent _) { - if (TabletopMap == MapId.Nullspace || !_mapManager.MapExists(TabletopMap)) + if (TabletopMap == MapId.Nullspace || !_map.MapExists(TabletopMap)) return; // This will usually *not* be the case, but better make sure. - _mapManager.DeleteMap(TabletopMap); + _map.DeleteMap(TabletopMap); // Reset tabletop count. _tabletops = 0; diff --git a/Content.Server/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs index f152648e21..6938372233 100644 --- a/Content.Server/Tabletop/TabletopSystem.cs +++ b/Content.Server/Tabletop/TabletopSystem.cs @@ -12,7 +12,6 @@ using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Configuration; using Robust.Shared.Enums; -using Robust.Shared.Map; using Robust.Shared.Player; using Robust.Shared.Utility; @@ -21,7 +20,7 @@ namespace Content.Server.Tabletop [UsedImplicitly] public sealed partial class TabletopSystem : SharedTabletopSystem { - [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private readonly SharedMapSystem _map = default!; [Dependency] private readonly EyeSystem _eye = default!; [Dependency] private readonly ViewSubscriberSystem _viewSubscriberSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; -- 2.51.2