Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

6
Content.Shared/Physics/PreventCollideComponent.cs
View File

@@ -15,10 +15,10 @@ public sealed partial class PreventCollideComponent : Component
[Serializable, NetSerializable]
public sealed class PreventCollideComponentState : ComponentState
{
public EntityUid Uid;
public NetEntity Uid;
public PreventCollideComponentState(PreventCollideComponent component)
public PreventCollideComponentState(NetEntity netEntity)
{
Uid = component.Uid;
Uid = netEntity;
}
}

4
Content.Shared/Physics/SharedPreventCollideSystem.cs
View File

@@ -17,7 +17,7 @@ public sealed class SharedPreventCollideSystem : EntitySystem
private void OnGetState(EntityUid uid, PreventCollideComponent component, ref ComponentGetState args)
{
args.State = new PreventCollideComponentState(component);
args.State = new PreventCollideComponentState(GetNetEntity(component.Uid));
}
private void OnHandleState(EntityUid uid, PreventCollideComponent component, ref ComponentHandleState args)
@@ -25,7 +25,7 @@ public sealed class SharedPreventCollideSystem : EntitySystem
if (args.Current is not PreventCollideComponentState state)
return;
component.Uid = state.Uid;
component.Uid = EnsureEntity<PreventCollideComponent>(state.Uid, uid);
}
private void OnPreventCollide(EntityUid uid, PreventCollideComponent component, ref PreventCollideEvent args)