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

4
Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs
View File

@@ -6,11 +6,11 @@ namespace Content.Shared.Ghost.Roles
[Serializable, NetSerializable]
public sealed class MakeGhostRoleEuiState : EuiStateBase
{
public MakeGhostRoleEuiState(EntityUid entityUid)
public MakeGhostRoleEuiState(NetEntity entityUid)
{
EntityUid = entityUid;
}
public EntityUid EntityUid { get; }
public NetEntity EntityUid { get; }
}
}

2
Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs
View File

@@ -7,6 +7,6 @@ namespace Content.Shared.Ghost.Roles
{
public string Name { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public EntityUid Id;
public NetEntity Id;
}
}

10
Content.Shared/Ghost/SharedGhostSystem.cs
View File

@@ -66,7 +66,7 @@ namespace Content.Shared.Ghost
[Serializable, NetSerializable]
public struct GhostWarp
{
public GhostWarp(EntityUid entity, string displayName, bool isWarpPoint)
public GhostWarp(NetEntity entity, string displayName, bool isWarpPoint)
{
Entity = entity;
DisplayName = displayName;
@@ -77,11 +77,13 @@ namespace Content.Shared.Ghost
/// The entity representing the warp point.
/// This is passed back to the server in <see cref="GhostWarpToTargetRequestEvent"/>
/// </summary>
public EntityUid Entity { get; }
public NetEntity Entity { get; }
/// <summary>
/// The display name to be surfaced in the ghost warps menu
/// </summary>
public string DisplayName { get; }
/// <summary>
/// Whether this warp represents a warp point or a player
/// </summary>
@@ -112,9 +114,9 @@ namespace Content.Shared.Ghost
[Serializable, NetSerializable]
public sealed class GhostWarpToTargetRequestEvent : EntityEventArgs
{
public EntityUid Target { get; }
public NetEntity Target { get; }
public GhostWarpToTargetRequestEvent(EntityUid target)
public GhostWarpToTargetRequestEvent(NetEntity target)
{
Target = target;
}