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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -12,10 +12,12 @@ public class PlayerSessionConverter : AdminLogConverter<SerializablePlayer>
{
writer.WriteStartObject();
if (value.Player.AttachedEntity != null)
if (value.Player.AttachedEntity is {Valid: true} playerEntity)
{
writer.WriteNumber("id", (int) (EntityUid) value.Player.AttachedEntity);
writer.WriteString("name", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(value.Player.AttachedEntity).EntityName);
var entityManager = IoCManager.Resolve<IEntityManager>();
writer.WriteNumber("id", (int) value.Player.AttachedEntity);
writer.WriteString("name", entityManager.GetComponent<MetaDataComponent>(playerEntity).EntityName);
}
writer.WriteString("player", value.Player.UserId.UserId);