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/Teleportation/Components/LinkedEntityComponent.cs
View File

@@ -27,9 +27,9 @@ public sealed partial class LinkedEntityComponent : Component
[Serializable, NetSerializable]
public sealed class LinkedEntityComponentState : ComponentState
{
public HashSet<EntityUid> LinkedEntities;
public HashSet<NetEntity> LinkedEntities;
public LinkedEntityComponentState(HashSet<EntityUid> linkedEntities)
public LinkedEntityComponentState(HashSet<NetEntity> linkedEntities)
{
LinkedEntities = linkedEntities;
}

4
Content.Shared/Teleportation/Components/PortalTimeoutComponent.cs
View File

@@ -20,9 +20,9 @@ public sealed partial class PortalTimeoutComponent : Component
[Serializable, NetSerializable]
public sealed class PortalTimeoutComponentState : ComponentState
{
public EntityUid? EnteredPortal;
public NetEntity? EnteredPortal;
public PortalTimeoutComponentState(EntityUid? enteredPortal)
public PortalTimeoutComponentState(NetEntity? enteredPortal)
{
EnteredPortal = enteredPortal;
}

6
Content.Shared/Teleportation/Systems/LinkedEntitySystem.cs
View File

@@ -26,13 +26,15 @@ public sealed class LinkedEntitySystem : EntitySystem
private void OnGetState(EntityUid uid, LinkedEntityComponent component, ref ComponentGetState args)
{
args.State = new LinkedEntityComponentState(component.LinkedEntities);
args.State = new LinkedEntityComponentState(GetNetEntitySet(component.LinkedEntities));
}
private void OnHandleState(EntityUid uid, LinkedEntityComponent component, ref ComponentHandleState args)
{
if (args.Current is LinkedEntityComponentState state)
component.LinkedEntities = state.LinkedEntities;
{
component.LinkedEntities = EnsureEntitySet<LinkedEntityComponent>(state.LinkedEntities, uid);
}
}
private void OnLinkShutdown(EntityUid uid, LinkedEntityComponent component, ComponentShutdown args)

4
Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
View File

@@ -79,13 +79,13 @@ public abstract class SharedPortalSystem : EntitySystem
private void OnGetState(EntityUid uid, PortalTimeoutComponent component, ref ComponentGetState args)
{
args.State = new PortalTimeoutComponentState(component.EnteredPortal);
args.State = new PortalTimeoutComponentState(GetNetEntity(component.EnteredPortal));
}
private void OnHandleState(EntityUid uid, PortalTimeoutComponent component, ref ComponentHandleState args)
{
if (args.Current is PortalTimeoutComponentState state)
component.EnteredPortal = state.EnteredPortal;
component.EnteredPortal = EnsureEntity<PortalTimeoutComponent>(state.EnteredPortal, uid);
}
private bool ShouldCollide(string ourId, string otherId, Fixture our, Fixture other)