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

Nullable grid Uid (#8798)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-20 12:14:35 +12:00
committed by GitHub
parent ef41cd5aa8
commit fa4c6f63f8
82 changed files with 318 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,10 +168,10 @@ namespace Content.Server.AI.Pathfinding.Accessible
{
var xform = EntityManager.GetComponent<TransformComponent>(target);
// TODO: Handle this gracefully instead of just failing.
if (!xform.GridEntityId.IsValid())
if (xform.GridUid == null)
return false;
var targetTile = _mapManager.GetGrid(xform.GridEntityId).GetTileRef(xform.Coordinates);
var targetTile = _mapManager.GetGrid(xform.GridUid.Value).GetTileRef(xform.Coordinates);
var targetNode = _pathfindingSystem.GetNode(targetTile);
var collisionMask = 0;
@@ -206,10 +206,10 @@ namespace Content.Server.AI.Pathfinding.Accessible
{
var xform = EntityManager.GetComponent<TransformComponent>(entity);
if (xform.GridEntityId != targetNode.TileRef.GridUid)
if (xform.GridUid != targetNode.TileRef.GridUid || xform.GridUid == null)
return false;
var entityTile = _mapManager.GetGrid(xform.GridEntityId).GetTileRef(xform.Coordinates);
var entityTile = _mapManager.GetGrid(xform.GridUid.Value).GetTileRef(xform.Coordinates);
var entityNode = _pathfindingSystem.GetNode(entityTile);
var entityRegion = GetRegion(entityNode);
var targetRegion = GetRegion(targetNode);
@@ -421,12 +421,12 @@ namespace Content.Server.AI.Pathfinding.Accessible
{
var xform = EntityManager.GetComponent<TransformComponent>(entity);
if (!xform.GridEntityId.IsValid())
if (xform.GridUid == null)
{
return null;
}
var entityTile = _mapManager.GetGrid(xform.GridEntityId).GetTileRef(xform.Coordinates);
var entityTile = _mapManager.GetGrid(xform.GridUid.Value).GetTileRef(xform.Coordinates);
var entityNode = _pathfindingSystem.GetNode(entityTile);
return GetRegion(entityNode);
}

18
Content.Server/AI/Pathfinding/PathfindingSystem.Grid.cs
View File

@@ -129,7 +129,7 @@ public sealed partial class PathfindingSystem
private bool IsRelevant(TransformComponent xform, PhysicsComponent physics)
{
return xform.GridEntityId != EntityUid.Invalid && (TrackedCollisionLayers & physics.CollisionLayer) != 0;
return xform.GridUid != null && (TrackedCollisionLayers & physics.CollisionLayer) != 0;
}
/// <summary>
@@ -143,7 +143,7 @@ public sealed partial class PathfindingSystem
!Resolve(entity, ref physics, false)) return;
if (!IsRelevant(xform, physics) ||
!_mapManager.TryGetGrid(xform.GridEntityId, out var grid))
!_mapManager.TryGetGrid(xform.GridUid, out var grid))
{
return;
}
@@ -158,7 +158,7 @@ public sealed partial class PathfindingSystem
private void OnEntityRemove(EntityUid entity, TransformComponent? xform = null)
{
if (!Resolve(entity, ref xform, false) ||
!_mapManager.TryGetGrid(xform.GridEntityId, out var grid)) return;
!_mapManager.TryGetGrid(xform.GridUid, out var grid)) return;
var node = GetNode(grid.GetTileRef(xform.Coordinates));
node.RemoveEntity(entity);
@@ -166,7 +166,7 @@ public sealed partial class PathfindingSystem
private void OnEntityRemove(EntityUid entity, EntityCoordinates coordinates)
{
var gridId = coordinates.GetGridEntityId(EntityManager);
var gridId = coordinates.GetGridUid(EntityManager);
if (!_mapManager.TryGetGrid(gridId, out var grid)) return;
var node = GetNode(grid.GetTileRef(coordinates));
@@ -175,13 +175,13 @@ public sealed partial class PathfindingSystem
private PathfindingNode? GetNode(TransformComponent xform)
{
if (!_mapManager.TryGetGrid(xform.GridEntityId, out var grid)) return null;
if (!_mapManager.TryGetGrid(xform.GridUid, out var grid)) return null;
return GetNode(grid.GetTileRef(xform.Coordinates));
}
private PathfindingNode? GetNode(EntityCoordinates coordinates)
{
if (!_mapManager.TryGetGrid(coordinates.GetGridEntityId(EntityManager), out var grid)) return null;
if (!_mapManager.TryGetGrid(coordinates.GetGridUid(EntityManager), out var grid)) return null;
return GetNode(grid.GetTileRef(coordinates));
}
@@ -215,8 +215,10 @@ public sealed partial class PathfindingSystem
// Also look at increasing tile cost the more physics entities are on it
public bool CanTraverse(EntityUid entity, EntityCoordinates coordinates)
{
var gridId = coordinates.GetGridEntityId(EntityManager);
var tile = _mapManager.GetGrid(gridId).GetTileRef(coordinates);
var gridId = coordinates.GetGridUid(EntityManager);
if (gridId == null)
return false;
var tile = _mapManager.GetGrid(gridId.Value).GetTileRef(coordinates);
var node = GetNode(tile);
return CanTraverse(entity, node);
}