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

2
Content.Shared/Radiation/Components/GeigerComponent.cs
View File

@@ -91,7 +91,7 @@ public sealed class GeigerComponentState : ComponentState
public float CurrentRadiation;
public GeigerDangerLevel DangerLevel;
public bool IsEnabled;
public EntityUid? User;
public NetEntity? User;
}
[Serializable, NetSerializable]

4
Content.Shared/Radiation/Events/OnRadiationOverlayUpdateEvent.cs
View File

@@ -72,9 +72,9 @@ public sealed class OnRadiationOverlayResistanceUpdateEvent : EntityEventArgs
/// <summary>
/// Key is grids uid. Values are tiles with their rad resistance.
/// </summary>
public readonly Dictionary<EntityUid, Dictionary<Vector2i, float>> Grids;
public readonly Dictionary<NetEntity, Dictionary<Vector2i, float>> Grids;
public OnRadiationOverlayResistanceUpdateEvent(Dictionary<EntityUid, Dictionary<Vector2i, float>> grids)
public OnRadiationOverlayResistanceUpdateEvent(Dictionary<NetEntity, Dictionary<Vector2i, float>> grids)
{
Grids = grids;
}

10
Content.Shared/Radiation/RadiationRay.cs
View File

@@ -19,7 +19,7 @@ public sealed class RadiationRay
/// <summary>
/// Uid of entity with <see cref="RadiationSourceComponent"/>.
/// </summary>
public EntityUid SourceUid;
public NetEntity SourceUid;
/// <summary>
/// World coordinates of radiation source.
/// </summary>
@@ -27,7 +27,7 @@ public sealed class RadiationRay
/// <summary>
/// Uid of entity with radiation receiver component.
/// </summary>
public EntityUid DestinationUid;
public NetEntity DestinationUid;
/// <summary>
/// World coordinates of radiation receiver.
/// </summary>
@@ -50,10 +50,10 @@ public sealed class RadiationRay
/// Last tile may have negative value if ray has lost all intensity.
/// Grid traversal order isn't guaranteed.
/// </remarks>
public Dictionary<EntityUid, List<(Vector2i, float)>> Blockers = new();
public Dictionary<NetEntity, List<(Vector2i, float)>> Blockers = new();
public RadiationRay(MapId mapId, EntityUid sourceUid, Vector2 source,
EntityUid destinationUid, Vector2 destination, float rads)
public RadiationRay(MapId mapId, NetEntity sourceUid, Vector2 source,
NetEntity destinationUid, Vector2 destination, float rads)
{
MapId = mapId;
SourceUid = sourceUid;