Inline UID
This commit is contained in:
@@ -42,7 +42,7 @@ namespace Content.Client.Administration
|
||||
}
|
||||
|
||||
// if not on the same map, continue
|
||||
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).MapID != _eyeManager.CurrentMap)
|
||||
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).MapID != _eyeManager.CurrentMap)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
|
||||
_target = target;
|
||||
|
||||
var targetName = _entityManager.TryGetEntity(target, out var entity)
|
||||
? IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName
|
||||
? IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityName
|
||||
: string.Empty;
|
||||
|
||||
Title = Loc.GetString("admin-solutions-window-title", ("targetName", targetName));
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
|
||||
foreach (var grid in _data)
|
||||
{
|
||||
IEntity? tempQualifier = IoCManager.Resolve<IPlayerManager>().LocalPlayer?.ControlledEntity;
|
||||
var playerGrid = (tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier.Uid) : null).GridID;
|
||||
var playerGrid = (tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier) : null).GridID;
|
||||
GridOptions.AddItem($"{grid.Index} {(playerGrid == grid.Index ? " (Current)" : "")}");
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
|
||||
foreach (var grid in _gridData)
|
||||
{
|
||||
IEntity? tempQualifier = IoCManager.Resolve<IPlayerManager>().LocalPlayer?.ControlledEntity;
|
||||
var playerGrid = (tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier.Uid) : null).GridID;
|
||||
var playerGrid = (tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier) : null).GridID;
|
||||
GridOptions.AddItem($"{grid.Index} {(playerGrid == grid.Index ? " (Current)" : "")}");
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
|
||||
foreach (var grid in _gridData)
|
||||
{
|
||||
IEntity? tempQualifier = IoCManager.Resolve<IPlayerManager>().LocalPlayer?.ControlledEntity;
|
||||
var playerGrid = (tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier.Uid) : null).GridID;
|
||||
var playerGrid = (tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier) : null).GridID;
|
||||
GridOptions.AddItem($"{grid.Index} {(playerGrid == grid.Index ? " (Current)" : "")}");
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
|
||||
foreach (var grid in _data)
|
||||
{
|
||||
IEntity? tempQualifier = IoCManager.Resolve<IPlayerManager>().LocalPlayer?.ControlledEntity;
|
||||
var playerGrid = (tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier.Uid) : null).GridID;
|
||||
var playerGrid = (tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier) : null).GridID;
|
||||
GridOptions.AddItem($"{grid.Index} {(playerGrid == grid.Index ? " (Current)" : "")}");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user