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

Remove stun and knockdown status effects before applying sleep (#15460)

Browse Source
This commit is contained in:
jicksaw
2023-04-22 14:06:45 +03:00
committed by GitHub
parent 2a3d1be9b8
commit 415eca285c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Bed/Sleep/SleepingSystem.cs
View File

@@ -10,6 +10,7 @@ using Content.Shared.IdentityManagement;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Mobs; using Content.Shared.Mobs;
using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Components;
using Content.Shared.StatusEffect;
using Content.Shared.Slippery; using Content.Shared.Slippery;
using Content.Shared.Stunnable; using Content.Shared.Stunnable;
using Content.Shared.Verbs; using Content.Shared.Verbs;
@@ -29,6 +30,7 @@ namespace Content.Server.Bed.Sleep
[Dependency] private readonly ActionsSystem _actionsSystem = default!; [Dependency] private readonly ActionsSystem _actionsSystem = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -53,6 +55,10 @@ namespace Content.Server.Bed.Sleep
_prototypeManager.TryIndex<InstantActionPrototype>("Wake", out var wakeAction); _prototypeManager.TryIndex<InstantActionPrototype>("Wake", out var wakeAction);
if (args.FellAsleep) if (args.FellAsleep)
{ {
// Expiring status effects would remove the components needed for sleeping
_statusEffectsSystem.TryRemoveStatusEffect(uid, "Stun");
_statusEffectsSystem.TryRemoveStatusEffect(uid, "KnockedDown");
EnsureComp<StunnedComponent>(uid); EnsureComp<StunnedComponent>(uid);
EnsureComp<KnockedDownComponent>(uid); EnsureComp<KnockedDownComponent>(uid);