Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use new ComponentPauseGenerator (#25183)

Browse Source 
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
This commit is contained in:
Pieter-Jan Briers
2024-02-26 04:36:19 +01:00
committed by GitHub
parent 2a2324ecaf
commit e00f74505c
130 changed files with 150 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Teleportation/Components/SwapTeleporterComponent.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Shared.Teleportation.Components;
/// This is used for an entity that, when linked to another valid entity, allows the two to swap positions,
/// additionally swapping the positions of the parents.
/// </summary>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
[Access(typeof(SwapTeleporterSystem))]
public sealed partial class SwapTeleporterComponent : Component
{
@@ -37,6 +37,7 @@ public sealed partial class SwapTeleporterComponent : Component
/// The time at which <see cref="Cooldown"/> ends and teleportation can occur again.
/// </summary>
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
[AutoPausedField]
public TimeSpan NextTeleportUse;
/// <summary>

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

@@ -33,7 +33,6 @@ public sealed class SwapTeleporterSystem : EntitySystem
SubscribeLocalEvent<SwapTeleporterComponent, ActivateInWorldEvent>(OnActivateInWorld);
SubscribeLocalEvent<SwapTeleporterComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<SwapTeleporterComponent, EntityUnpausedEvent>(OnUnpaused);
SubscribeLocalEvent<SwapTeleporterComponent, ComponentShutdown>(OnShutdown);
_xformQuery = GetEntityQuery<TransformComponent>();
@@ -217,11 +216,6 @@ public sealed class SwapTeleporterSystem : EntitySystem
}
}
private void OnUnpaused(Entity<SwapTeleporterComponent> ent, ref EntityUnpausedEvent args)
{
ent.Comp.NextTeleportUse += args.PausedTime;
}
private void OnShutdown(Entity<SwapTeleporterComponent> ent, ref ComponentShutdown args)
{
DestroyLink((ent, ent), null);