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

8
Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
View File

@@ -13,7 +13,6 @@ public sealed class DamageOnHoldingSystem : EntitySystem
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<DamageOnHoldingComponent, EntityUnpausedEvent>(OnUnpaused);
SubscribeLocalEvent<DamageOnHoldingComponent, MapInitEvent>(OnMapInit);
}
@@ -26,11 +25,6 @@ public sealed class DamageOnHoldingSystem : EntitySystem
}
}
private void OnUnpaused(EntityUid uid, DamageOnHoldingComponent component, ref EntityUnpausedEvent args)
{
component.NextDamage += args.PausedTime;
}
private void OnMapInit(EntityUid uid, DamageOnHoldingComponent component, MapInitEvent args)
{
component.NextDamage = _timing.CurTime;
@@ -50,4 +44,4 @@ public sealed class DamageOnHoldingSystem : EntitySystem
component.NextDamage = _timing.CurTime + TimeSpan.FromSeconds(component.Interval);
}
}
}
}

6
Content.Shared/Damage/Systems/StaminaSystem.cs
View File

@@ -46,7 +46,6 @@ public sealed partial class StaminaSystem : EntitySystem
InitializeModifier();
SubscribeLocalEvent<StaminaComponent, EntityUnpausedEvent>(OnStamUnpaused);
SubscribeLocalEvent<StaminaComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<StaminaComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<StaminaComponent, AfterAutoHandleStateEvent>(OnStamHandleState);
@@ -61,11 +60,6 @@ public sealed partial class StaminaSystem : EntitySystem
SubscribeLocalEvent<StaminaDamageOnHitComponent, MeleeHitEvent>(OnMeleeHit);
}
private void OnStamUnpaused(EntityUid uid, StaminaComponent component, ref EntityUnpausedEvent args)
{
component.NextUpdate += args.PausedTime;
}
private void OnStamHandleState(EntityUid uid, StaminaComponent component, ref AfterAutoHandleStateEvent args)
{
if (component.Critical)