diff --git a/Robust.Shared/Map/IMapManager.cs b/Robust.Shared/Map/IMapManager.cs index 4d4631876..9c968214a 100644 --- a/Robust.Shared/Map/IMapManager.cs +++ b/Robust.Shared/Map/IMapManager.cs @@ -157,30 +157,6 @@ namespace Robust.Shared.Map [Obsolete("Subscribe to TileChangedEvent on the event bus.")] event EventHandler TileChanged; - [Obsolete("Subscribe to GridStartupEvent on the event bus.")] - event GridEventHandler OnGridCreated; - - [Obsolete("Subscribe to GridRemovalEvent on the event bus.")] - event GridEventHandler OnGridRemoved; - - /// - /// A Grid was modified. - /// - [Obsolete("Subscribe to GridModifiedEvent on the event bus.")] - event EventHandler GridChanged; - - /// - /// A new map has been created. - /// - [Obsolete("Subscribe to MapChangedEvent on the event bus, and check if Created is true.")] - event EventHandler MapCreated; - - /// - /// An existing map has been destroyed. - /// - [Obsolete("Subscribe to MapChangedEvent on the event bus, and check if Destroyed is true.")] - event EventHandler MapDestroyed; - bool HasMapEntity(MapId mapId); bool IsGrid(EntityUid uid); diff --git a/Robust.Shared/Map/MapManager.GridCollection.cs b/Robust.Shared/Map/MapManager.GridCollection.cs index b403c5ef5..1496fc7a8 100644 --- a/Robust.Shared/Map/MapManager.GridCollection.cs +++ b/Robust.Shared/Map/MapManager.GridCollection.cs @@ -77,7 +77,6 @@ internal partial class MapManager var xform = EntityManager.GetComponent(gridComponent.Owner); Logger.InfoS("map", $"Binding grid {mapGrid.GridEntityId} to entity {gridComponent.Owner}"); - OnGridCreated?.Invoke(xform.MapID, mapGrid.GridEntityId); } public GridEnumerator GetAllGridsEnumerator() @@ -193,17 +192,11 @@ internal partial class MapManager _grids.Remove(grid.GridEntityId); Logger.DebugS("map", $"Deleted grid {grid.GridEntityId}"); - - // TODO: Remove this trash - OnGridRemoved?.Invoke(mapId, grid.GridEntityId); } /// public event EventHandler? TileChanged; - public event GridEventHandler? OnGridCreated; - public event GridEventHandler? OnGridRemoved; - /// /// Should the OnTileChanged event be suppressed? This is useful for initially loading the map /// so that you don't spam an event for each of the million station tiles.