tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove transform methods from mapgrid (#12233)

Browse Source
This commit is contained in:
metalgearsloth
2022-11-01 11:27:18 +11:00
committed by GitHub
parent 297686c4ff
commit c9a2ab1cee
25 changed files with 144 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
View File

@@ -122,11 +122,18 @@ public sealed partial class AtmosphereSystem
if (shell.Player is { AttachedEntity: { } playerEnt })
playerMap = Transform(playerEnt).MapID;
var options = _mapManager.GetAllGrids()
.OrderByDescending(e => playerMap != null && e.ParentMapId == playerMap)
.ThenBy(e => (int) e.ParentMapId)
.ThenBy(e => (int) e.GridEntityId)
.Select(e => new CompletionOption(e.GridEntityId.ToString(), $"{MetaData(e.GridEntityId).EntityName} - Map {e.ParentMapId}"));
var options = new List<CompletionOption>();
if (playerMap == null)
return CompletionResult.FromOptions(options);
foreach (var grid in _mapManager.GetAllMapGrids(playerMap.Value).OrderBy(o => o.GridEntityId))
{
if (!TryComp<TransformComponent>(grid.GridEntityId, out var gridXform))
continue;
options.Add(new CompletionOption(grid.GridEntityId.ToString(), $"{MetaData(grid.GridEntityId).EntityName} - Map {gridXform.MapID}"));
}
return CompletionResult.FromOptions(options);
}