Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

2
Content.Client/IconSmoothing/IconSmoothComponent.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Client.IconSmoothing
[RegisterComponent]
public sealed class IconSmoothComponent : Component
{
public (EntityUid, Vector2i)? LastPosition;
public (EntityUid?, Vector2i)? LastPosition;
/// <summary>
/// We will smooth with other objects with the same key.

12
Content.Client/IconSmoothing/IconSmoothSystem.cs
View File

@@ -33,9 +33,9 @@ namespace Content.Client.IconSmoothing
var xform = Transform(uid);
if (xform.Anchored)
{
component.LastPosition = _mapManager.TryGetGrid(xform.GridEntityId, out var grid)
? (xform.GridEntityId, grid.TileIndicesFor(xform.Coordinates))
: (EntityUid.Invalid, new Vector2i(0, 0));
component.LastPosition = _mapManager.TryGetGrid(xform.GridUid, out var grid)
? (xform.GridUid.Value, grid.TileIndicesFor(xform.Coordinates))
: (null, new Vector2i(0, 0));
DirtyNeighbours(uid, component);
}
@@ -111,7 +111,7 @@ namespace Content.Client.IconSmoothing
Vector2i pos;
if (transform.Anchored && _mapManager.TryGetGrid(transform.GridEntityId, out var grid))
if (transform.Anchored && _mapManager.TryGetGrid(transform.GridUid, out var grid))
{
pos = grid.CoordinatesToTile(transform.Coordinates);
}
@@ -191,9 +191,9 @@ namespace Content.Client.IconSmoothing
if (xform.Anchored)
{
if (!_mapManager.TryGetGrid(xform.GridEntityId, out grid))
if (!_mapManager.TryGetGrid(xform.GridUid, out grid))
{
Logger.Error($"Failed to calculate IconSmoothComponent sprite in {uid} because grid {xform.GridEntityId} was missing.");
Logger.Error($"Failed to calculate IconSmoothComponent sprite in {uid} because grid {xform.GridUid} was missing.");
return;
}
}