Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Removes obsolete uses of IMapManager events. (#7036)

Browse Source
This commit is contained in:
ScalyChimp
2022-03-09 07:39:03 +01:00
committed by GitHub
parent df858100af
commit d691161542
7 changed files with 45 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs
View File

@@ -83,11 +83,11 @@ namespace Content.Server.AI.Pathfinding.Accessible
{
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
SubscribeLocalEvent<PathfindingChunkUpdateMessage>(RecalculateNodeRegions);
SubscribeLocalEvent<GridRemovalEvent>(GridRemoved);
#if DEBUG
SubscribeNetworkEvent<SharedAiDebug.SubscribeReachableMessage>(HandleSubscription);
SubscribeNetworkEvent<SharedAiDebug.UnsubscribeReachableMessage>(HandleUnsubscription);
#endif
_mapManager.OnGridRemoved += GridRemoved;
}
public override void Shutdown()
@@ -99,12 +99,11 @@ namespace Content.Server.AI.Pathfinding.Accessible
_cachedAccessible.Clear();
_queuedCacheDeletions.Clear();
_mapManager.OnGridRemoved -= GridRemoved;
}
private void GridRemoved(MapId mapId, GridId gridId)
private void GridRemoved(GridRemovalEvent ev)
{
_regions.Remove(gridId);
_regions.Remove(ev.GridId);
}
public override void Update(float frameTime)

32
Content.Server/AI/Pathfinding/PathfindingSystem.cs
View File

@@ -206,21 +206,13 @@ namespace Content.Server.AI.Pathfinding
SubscribeLocalEvent<CollisionChangeMessage>(QueueCollisionChangeMessage);
SubscribeLocalEvent<MoveEvent>(QueueMoveEvent);
SubscribeLocalEvent<AccessReaderChangeMessage>(QueueAccessChangeMessage);
SubscribeLocalEvent<GridRemovalEvent>(HandleGridRemoval);
SubscribeLocalEvent<GridModifiedEvent>(QueueGridChange);
SubscribeLocalEvent<TileChangedEvent>(QueueTileChange);
// Handle all the base grid changes
// Anything that affects traversal (i.e. collision layer) is handled separately.
_mapManager.OnGridRemoved += HandleGridRemoval;
_mapManager.GridChanged += QueueGridChange;
_mapManager.TileChanged += QueueTileChange;
}
public override void Shutdown()
{
base.Shutdown();
_mapManager.OnGridRemoved -= HandleGridRemoval;
_mapManager.GridChanged -= QueueGridChange;
_mapManager.TileChanged -= QueueTileChange;
}
private void HandleTileUpdate(TileRef tile)
@@ -231,25 +223,25 @@ namespace Content.Server.AI.Pathfinding
node.UpdateTile(tile);
}
private void HandleGridRemoval(MapId mapId, GridId gridId)
private void HandleGridRemoval(GridRemovalEvent ev)
{
if (_graph.ContainsKey(gridId))
if (_graph.ContainsKey(ev.GridId))
{
_graph.Remove(gridId);
_graph.Remove(ev.GridId);
}
}
private void QueueGridChange(object? sender, GridChangedEventArgs eventArgs)
private void QueueGridChange(GridModifiedEvent ev)
{
foreach (var (position, _) in eventArgs.Modified)
foreach (var (position, _) in ev.Modified)
{
_tileUpdateQueue.Enqueue(eventArgs.Grid.GetTileRef(position));
_tileUpdateQueue.Enqueue(ev.Grid.GetTileRef(position));
}
}
private void QueueTileChange(object? sender, TileChangedEventArgs eventArgs)
private void QueueTileChange(TileChangedEvent ev)
{
_tileUpdateQueue.Enqueue(eventArgs.NewTile);
_tileUpdateQueue.Enqueue(ev.NewTile);
}
private void QueueAccessChangeMessage(AccessReaderChangeMessage message)