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

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Body/Organ/OrganComponentState.cs
View File

@@ -5,10 +5,10 @@ namespace Content.Shared.Body.Organ;
[Serializable, NetSerializable]
public sealed class OrganComponentState : ComponentState
{
public readonly EntityUid? Body;
public readonly NetEntity? Body;
public readonly OrganSlot? Parent;
public OrganComponentState(EntityUid? body, OrganSlot? parent)
public OrganComponentState(NetEntity? body, OrganSlot? parent)
{
Body = body;
Parent = parent;

19
Content.Shared/Body/Organ/OrganSlot.cs
View File

@@ -5,10 +5,23 @@ namespace Content.Shared.Body.Organ;
[Serializable, NetSerializable]
[Access(typeof(SharedBodySystem))]
[DataRecord]
public sealed record OrganSlot(string Id, EntityUid Parent)
[DataDefinition]
public sealed partial record OrganSlot
{
public EntityUid? Child { get; set; }
[DataField("id")]
public string Id = string.Empty;
[NonSerialized]
[DataField("parent")]
public EntityUid Parent;
public NetEntity NetParent;
[NonSerialized]
[DataField("child")]
public EntityUid? Child;
public NetEntity? NetChild;
// Rider doesn't suggest explicit properties during deconstruction without this
public void Deconstruct(out EntityUid? child, out string id, out EntityUid parent)