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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Administration/AdminSystem.cs
View File

@@ -126,10 +126,10 @@ namespace Content.Server.Administration
var username = string.Empty;
if(session.AttachedEntity != null)
username = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(session.AttachedEntity.Uid).EntityName;
username = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(session.AttachedEntity).EntityName;
var antag = session.ContentData()?.Mind?.AllRoles.Any(r => r.Antagonist) ?? false;
var uid = session.AttachedEntity?.Uid ?? EntityUid.Invalid;
var uid = session.AttachedEntity ?? EntityUid.Invalid;
return new PlayerInfo(name, username, antag, uid, session.UserId);
}

28
Content.Server/Administration/AdminVerbSystem.cs
View File

@@ -56,7 +56,7 @@ namespace Content.Server.Administration
private void AddDebugVerbs(GetOtherVerbsEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(args.User.Uid, out var actor))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(args.User, out var actor))
return;
var player = actor.PlayerSession;
@@ -68,7 +68,7 @@ namespace Content.Server.Administration
verb.Text = Loc.GetString("delete-verb-get-data-text");
verb.Category = VerbCategory.Debug;
verb.IconTexture = "/Textures/Interface/VerbIcons/delete_transparent.svg.192dpi.png";
verb.Act = () => IoCManager.Resolve<IEntityManager>().DeleteEntity(args.Target.Uid);
verb.Act = () => IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) args.Target);
verb.Impact = LogImpact.Medium;
args.Verbs.Add(verb);
}
@@ -88,8 +88,8 @@ namespace Content.Server.Administration
// Control mob verb
if (_groupController.CanCommand(player, "controlmob") &&
args.User != args.Target &&
IoCManager.Resolve<IEntityManager>().HasComponent<MindComponent>(args.User.Uid) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<MindComponent?>(args.Target.Uid, out var targetMind))
IoCManager.Resolve<IEntityManager>().HasComponent<MindComponent>(args.User) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<MindComponent?>(args.Target, out var targetMind))
{
Verb verb = new();
verb.Text = Loc.GetString("control-mob-verb-get-data-text");
@@ -97,7 +97,7 @@ namespace Content.Server.Administration
// TODO VERB ICON control mob icon
verb.Act = () =>
{
player.ContentData()?.Mind?.TransferTo(args.Target.Uid, ghostCheckOverride: true);
player.ContentData()?.Mind?.TransferTo(args.Target, ghostCheckOverride: true);
};
verb.Impact = LogImpact.High;
args.Verbs.Add(verb);
@@ -106,13 +106,13 @@ namespace Content.Server.Administration
// Make Sentient verb
if (_groupController.CanCommand(player, "makesentient") &&
args.User != args.Target &&
!IoCManager.Resolve<IEntityManager>().HasComponent<MindComponent>(args.Target.Uid))
!IoCManager.Resolve<IEntityManager>().HasComponent<MindComponent>(args.Target))
{
Verb verb = new();
verb.Text = Loc.GetString("make-sentient-verb-get-data-text");
verb.Category = VerbCategory.Debug;
verb.IconTexture = "/Textures/Interface/VerbIcons/sentient.svg.192dpi.png";
verb.Act = () => MakeSentientCommand.MakeSentient(args.Target.Uid, EntityManager);
verb.Act = () => MakeSentientCommand.MakeSentient(args.Target, EntityManager);
verb.Impact = LogImpact.Medium;
args.Verbs.Add(verb);
}
@@ -125,9 +125,9 @@ namespace Content.Server.Administration
verb.Category = VerbCategory.Debug;
verb.Act = () =>
{
var coords = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.Target.Uid).Coordinates;
var coords = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.Target).Coordinates;
Timer.Spawn(_gameTiming.TickPeriod, () => _explosions.SpawnExplosion(coords, 0, 1, 2, 1), CancellationToken.None);
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Target.Uid, out SharedBodyComponent? body))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Target, out SharedBodyComponent? body))
{
body.Gib();
}
@@ -138,7 +138,7 @@ namespace Content.Server.Administration
// Set clothing verb
if (_groupController.CanCommand(player, "setoutfit") &&
IoCManager.Resolve<IEntityManager>().HasComponent<InventoryComponent>(args.Target.Uid))
IoCManager.Resolve<IEntityManager>().HasComponent<InventoryComponent>(args.Target))
{
Verb verb = new();
verb.Text = Loc.GetString("set-outfit-verb-get-data-text");
@@ -168,7 +168,7 @@ namespace Content.Server.Administration
// Get Disposal tube direction verb
if (_groupController.CanCommand(player, "tubeconnections") &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<IDisposalTubeComponent?>(args.Target.Uid, out var tube))
IoCManager.Resolve<IEntityManager>().TryGetComponent<IDisposalTubeComponent?>(args.Target, out var tube))
{
Verb verb = new();
verb.Text = Loc.GetString("tube-direction-verb-get-data-text");
@@ -187,7 +187,7 @@ namespace Content.Server.Administration
verb.Category = VerbCategory.Debug;
// TODO VERB ICON add ghost icon
// Where is the national park service icon for haunted forests?
verb.Act = () => _ghostRoleSystem.OpenMakeGhostRoleEui(player, args.Target.Uid);
verb.Act = () => _ghostRoleSystem.OpenMakeGhostRoleEui(player, args.Target);
verb.Impact = LogImpact.Medium;
args.Verbs.Add(verb);
}
@@ -206,13 +206,13 @@ namespace Content.Server.Administration
// Add verb to open Solution Editor
if (_groupController.CanCommand(player, "addreagent") &&
IoCManager.Resolve<IEntityManager>().HasComponent<SolutionContainerManagerComponent>(args.Target.Uid))
IoCManager.Resolve<IEntityManager>().HasComponent<SolutionContainerManagerComponent>(args.Target))
{
Verb verb = new();
verb.Text = Loc.GetString("edit-solutions-verb-get-data-text");
verb.Category = VerbCategory.Debug;
verb.IconTexture = "/Textures/Interface/VerbIcons/spill.svg.192dpi.png";
verb.Act = () => OpenEditSolutionsEui(player, args.Target.Uid);
verb.Act = () => OpenEditSolutionsEui(player, args.Target);
verb.Impact = LogImpact.Medium; // maybe high depending on WHAT reagents they add...
args.Verbs.Add(verb);
}

14
Content.Server/Administration/Commands/AGhost.cs
View File

@@ -35,7 +35,7 @@ namespace Content.Server.Administration.Commands
return;
}
if (mind.VisitingEntity != null && IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(mind.VisitingEntity.Uid))
if (mind.VisitingEntity != null && IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(mind.VisitingEntity))
{
player.ContentData()!.Mind?.UnVisit();
return;
@@ -43,26 +43,26 @@ namespace Content.Server.Administration.Commands
var canReturn = mind.CurrentEntity != null;
IEntity? tempQualifier = player.AttachedEntity;
var ghost = IoCManager.Resolve<IEntityManager>().SpawnEntity((string?) "AdminObserver", (EntityCoordinates) ((tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier.Uid) : null).Coordinates
var ghost = IoCManager.Resolve<IEntityManager>().SpawnEntity((string?) "AdminObserver", (EntityCoordinates) ((tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier) : null).Coordinates
?? EntitySystem.Get<GameTicker>().GetObserverSpawnPoint()));
if (canReturn)
{
// TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"...
if(!string.IsNullOrWhiteSpace(mind.CharacterName))
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ghost.Uid).EntityName = mind.CharacterName;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ghost).EntityName = mind.CharacterName;
else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ghost.Uid).EntityName = mind.Session.Name;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ghost).EntityName = mind.Session.Name;
mind.Visit(ghost);
}
else
{
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ghost.Uid).EntityName = player.Name;
mind.TransferTo(ghost.Uid);
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ghost).EntityName = player.Name;
mind.TransferTo(ghost);
}
var comp = IoCManager.Resolve<IEntityManager>().GetComponent<GhostComponent>(ghost.Uid);
var comp = IoCManager.Resolve<IEntityManager>().GetComponent<GhostComponent>(ghost);
EntitySystem.Get<SharedGhostSystem>().SetCanReturnToBody(comp, canReturn);
}
}

4
Content.Server/Administration/Commands/ControlMob.cs
View File

@@ -50,7 +50,7 @@ namespace Content.Server.Administration.Commands
}
var target = entityManager.GetEntity(eUid);
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(target.Uid, out MindComponent? mindComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out MindComponent? mindComponent))
{
shell.WriteLine(Loc.GetString("shell-entity-is-not-mob"));
return;
@@ -60,7 +60,7 @@ namespace Content.Server.Administration.Commands
DebugTools.AssertNotNull(mind);
mind!.TransferTo(target.Uid);
mind!.TransferTo(target);
}
}
}

2
Content.Server/Administration/Commands/DeleteComponent.cs
View File

@@ -37,7 +37,7 @@ namespace Content.Server.Administration.Commands
foreach (var component in components)
{
var uid = component.Owner.Uid;
var uid = (EntityUid) component.Owner;
entityManager.RemoveComponent(uid, component);
i++;
}

2
Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs
View File

@@ -42,7 +42,7 @@ namespace Content.Server.Administration.Commands
var count = 0;
foreach (var entity in entitiesWithAllComponents)
{
IoCManager.Resolve<IEntityManager>().DeleteEntity(entity.Uid);
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) entity);
count += 1;
}

4
Content.Server/Administration/Commands/DeleteEntitiesWithId.cs
View File

@@ -24,12 +24,12 @@ namespace Content.Server.Administration.Commands
var id = args[0].ToLower();
var entityManager = IoCManager.Resolve<IEntityManager>();
var entities = entityManager.GetEntities().Where(e => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(e.Uid).EntityPrototype?.ID.ToLower() == id);
var entities = entityManager.GetEntities().Where(e => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(e).EntityPrototype?.ID.ToLower() == id);
var i = 0;
foreach (var entity in entities)
{
IoCManager.Resolve<IEntityManager>().DeleteEntity(entity.Uid);
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) entity);
i++;
}

2
Content.Server/Administration/Commands/DeleteEntityCommand.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.Administration.Commands
return;
}
IoCManager.Resolve<IEntityManager>().DeleteEntity(entity.Uid);
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) entity);
shell.WriteLine($"Deleted entity with id {id}.");
}
}

4
Content.Server/Administration/Commands/ExplosionCommand.cs
View File

@@ -33,8 +33,8 @@ namespace Content.Server.Administration.Commands
var lgh = int.Parse(args[4]);
var fla = int.Parse(args[5]);
var mapTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity.Uid).GetMapTransform();
var coords = new EntityCoordinates(mapTransform.Owner.Uid, x, y);
var mapTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity).GetMapTransform();
var coords = new EntityCoordinates(mapTransform.Owner, x, y);
EntitySystem.Get<ExplosionSystem>().SpawnExplosion(coords, dev, hvy, lgh, fla);
}

4
Content.Server/Administration/Commands/FindEntitiesWithComponents.cs
View File

@@ -53,12 +53,12 @@ namespace Content.Server.Administration.Commands
foreach (var entity in entitiesWithAllComponents)
{
if (IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityPrototype == null)
if (IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityPrototype == null)
{
continue;
}
entityIds.Add(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityPrototype.ID);
entityIds.Add(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityPrototype.ID);
}
if (entityIds.Count == 0)

18
Content.Server/Administration/Commands/RejuvenateCommand.cs
View File

@@ -53,32 +53,32 @@ namespace Content.Server.Administration.Commands
public static void PerformRejuvenate(IEntity target)
{
var targetUid = target.Uid;
var targetUid = (EntityUid) target;
var entMan = IoCManager.Resolve<IEntityManager>();
entMan.GetComponentOrNull<MobStateComponent>(targetUid)?.UpdateState(0);
entMan.GetComponentOrNull<HungerComponent>(targetUid)?.ResetFood();
entMan.GetComponentOrNull<ThirstComponent>(targetUid)?.ResetThirst();
EntitySystem.Get<StatusEffectsSystem>().TryRemoveAllStatusEffects(target.Uid);
EntitySystem.Get<StatusEffectsSystem>().TryRemoveAllStatusEffects(target);
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(target.Uid, out FlammableComponent? flammable))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out FlammableComponent? flammable))
{
EntitySystem.Get<FlammableSystem>().Extinguish(target.Uid, flammable);
EntitySystem.Get<FlammableSystem>().Extinguish(target, flammable);
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(target.Uid, out DamageableComponent? damageable))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out DamageableComponent? damageable))
{
EntitySystem.Get<DamageableSystem>().SetAllDamage(damageable, 0);
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(target.Uid, out CreamPiedComponent? creamPied))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out CreamPiedComponent? creamPied))
{
EntitySystem.Get<CreamPieSystem>().SetCreamPied(target.Uid, creamPied, false);
EntitySystem.Get<CreamPieSystem>().SetCreamPied(target, creamPied, false);
}
if (IoCManager.Resolve<IEntityManager>().HasComponent<JitteringComponent>(target.Uid))
if (IoCManager.Resolve<IEntityManager>().HasComponent<JitteringComponent>(target))
{
IoCManager.Resolve<IEntityManager>().RemoveComponent<JitteringComponent>(target.Uid);
IoCManager.Resolve<IEntityManager>().RemoveComponent<JitteringComponent>(target);
}
}
}

8
Content.Server/Administration/Commands/RemoveExtraComponents.cs
View File

@@ -33,19 +33,19 @@ namespace Content.Server.Administration.Commands
foreach (var entity in entityManager.GetEntities())
{
if (checkPrototype && IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityPrototype != prototype || IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityPrototype == null)
if (checkPrototype && IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityPrototype != prototype || IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityPrototype == null)
{
continue;
}
var modified = false;
foreach (var component in IoCManager.Resolve<IEntityManager>().GetComponents(entity.Uid))
foreach (var component in IoCManager.Resolve<IEntityManager>().GetComponents(entity))
{
if (IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityPrototype.Components.ContainsKey(component.Name))
if (IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityPrototype.Components.ContainsKey(component.Name))
continue;
entityManager.RemoveComponent(entity.Uid, component);
entityManager.RemoveComponent(entity, component);
components++;
modified = true;

6
Content.Server/Administration/Commands/SetMindCommand.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.Administration.Commands
var target = entityManager.GetEntity(eUid);
if (!IoCManager.Resolve<IEntityManager>().HasComponent<MindComponent>(target.Uid))
if (!IoCManager.Resolve<IEntityManager>().HasComponent<MindComponent>(target))
{
shell.WriteLine(Loc.GetString("set-mind-command-target-has-no-mind-message"));
return;
@@ -69,11 +69,11 @@ namespace Content.Server.Administration.Commands
{
mind = new Mind.Mind(session.UserId)
{
CharacterName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target.Uid).EntityName
CharacterName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName
};
mind.ChangeOwningPlayer(session.UserId);
}
mind.TransferTo(target.Uid);
mind.TransferTo(target);
}
}
}

12
Content.Server/Administration/Commands/SetOutfitCommand.cs
View File

@@ -53,7 +53,7 @@ namespace Content.Server.Administration.Commands
var target = entityManager.GetEntity(eUid);
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<InventoryComponent?>(target.Uid, out var inventoryComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<InventoryComponent?>(target, out var inventoryComponent))
{
shell.WriteLine(Loc.GetString("shell-target-entity-does-not-have-message",("missing", "inventory")));
return;
@@ -82,7 +82,7 @@ namespace Content.Server.Administration.Commands
HumanoidCharacterProfile? profile = null;
// Check if we are setting the outfit of a player to respect the preferences
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(target.Uid, out var actorComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(target, out var actorComponent))
{
var userId = actorComponent.PlayerSession.UserId;
var preferencesManager = IoCManager.Resolve<IServerPreferencesManager>();
@@ -98,15 +98,15 @@ namespace Content.Server.Administration.Commands
{
continue;
}
var equipmentEntity = entityManager.SpawnEntity(gearStr, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target.Uid).Coordinates);
var equipmentEntity = entityManager.SpawnEntity(gearStr, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates);
if (slot == EquipmentSlotDefines.Slots.IDCARD &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<PDAComponent?>(equipmentEntity.Uid, out var pdaComponent) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<PDAComponent?>(equipmentEntity, out var pdaComponent) &&
pdaComponent.ContainedID != null)
{
pdaComponent.ContainedID.FullName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target.Uid).EntityName;
pdaComponent.ContainedID.FullName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName;
}
inventoryComponent.Equip(slot, IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(equipmentEntity.Uid), false);
inventoryComponent.Equip(slot, IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(equipmentEntity), false);
}
}
}

10
Content.Server/Administration/Commands/WarpCommand.cs
View File

@@ -60,12 +60,12 @@ namespace Content.Server.Administration.Commands
}
var mapManager = IoCManager.Resolve<IMapManager>();
var currentMap = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity.Uid).MapID;
var currentGrid = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity.Uid).GridID;
var currentMap = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity).MapID;
var currentGrid = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity).GridID;
var found = entMan.EntityQuery<WarpPointComponent>(true)
.Where(p => p.Location == location)
.Select(p => IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(p.Owner.Uid).Coordinates)
.Select(p => IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(p.Owner).Coordinates)
.OrderBy(p => p, Comparer<EntityCoordinates>.Create((a, b) =>
{
// Sort so that warp points on the same grid/map are first.
@@ -113,8 +113,8 @@ namespace Content.Server.Administration.Commands
if (found.GetGridId(entMan) != GridId.Invalid)
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity.Uid).Coordinates = found;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity.Uid, out IPhysBody? physics))
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity).Coordinates = found;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity, out IPhysBody? physics))
{
physics.LinearVelocity = Vector2.Zero;
}

2
Content.Server/Administration/Logs/AdminLogSystem.Json.cs
View File

@@ -57,7 +57,7 @@ public partial class AdminLogSystem
EntityUid? entityId = properties[key] switch
{
EntityUid id => id,
IEntity entity => entity.Uid,
IEntity entity => entity,
IPlayerSession {AttachedEntityUid: { }} session => session.AttachedEntityUid.Value,
IComponent component => component.OwnerUid,
_ => null

2
Content.Server/Administration/Logs/Converters/EntityConverter.cs
View File

@@ -12,6 +12,6 @@ public class EntityConverter : AdminLogConverter<IEntity>
public override void Write(Utf8JsonWriter writer, IEntity value, JsonSerializerOptions options)
{
EntityUidConverter.Write(writer, value.Uid, options, _entities);
EntityUidConverter.Write(writer, value, options, _entities);
}
}

4
Content.Server/Administration/Logs/Converters/PlayerSessionConverter.cs
View File

@@ -14,8 +14,8 @@ public class PlayerSessionConverter : AdminLogConverter<SerializablePlayer>
if (value.Player.AttachedEntity != null)
{
writer.WriteNumber("id", (int) value.Player.AttachedEntity.Uid);
writer.WriteString("name", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(value.Player.AttachedEntity.Uid).EntityName);
writer.WriteNumber("id", (int) (EntityUid) value.Player.AttachedEntity);
writer.WriteString("name", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(value.Player.AttachedEntity).EntityName);
}
writer.WriteString("player", value.Player.UserId.UserId);

2
Content.Server/Administration/UI/SetOutfitEui.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.Administration.UI
{
return new SetOutfitEuiState
{
TargetEntityId = _target.Uid
TargetEntityId = _target
};
}