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

5
Content.Shared/Throwing/ThrownItemComponent.cs
View File

@@ -6,15 +6,16 @@ namespace Content.Shared.Throwing
[RegisterComponent, NetworkedComponent]
public sealed partial class ThrownItemComponent : Component
{
[ViewVariables(VVAccess.ReadWrite), DataField("thrower")]
public EntityUid? Thrower { get; set; }
}
[Serializable, NetSerializable]
public sealed class ThrownItemComponentState : ComponentState
{
public EntityUid? Thrower { get; }
public NetEntity? Thrower { get; }
public ThrownItemComponentState(EntityUid? thrower)
public ThrownItemComponentState(NetEntity? thrower)
{
Thrower = thrower;
}

4
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Shared.Throwing
private void OnGetState(EntityUid uid, ThrownItemComponent component, ref ComponentGetState args)
{
args.State = new ThrownItemComponentState(component.Thrower);
args.State = new ThrownItemComponentState(GetNetEntity(component.Thrower));
}
private void OnHandleState(EntityUid uid, ThrownItemComponent component, ref ComponentHandleState args)
@@ -49,7 +49,7 @@ namespace Content.Shared.Throwing
return;
}
component.Thrower = state.Thrower.Value;
component.Thrower = EnsureEntity<ThrownItemComponent>(state.Thrower.Value, uid);
}
private void ThrowItem(EntityUid uid, ThrownItemComponent component, ThrownEvent args)