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

Fix sleeping action not working (#20813)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-07 12:11:02 -07:00
committed by GitHub
parent 3101e5a18d
commit e4c4d9b0a4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
using Content.Server.Actions;
using Content.Server.Popups; using Content.Server.Popups;
using Content.Server.Sound.Components; using Content.Server.Sound.Components;
using Content.Shared.Actions;
using Content.Shared.Audio; using Content.Shared.Audio;
using Content.Shared.Bed.Sleep; using Content.Shared.Bed.Sleep;
using Content.Shared.Damage; using Content.Shared.Damage;
@@ -36,6 +36,7 @@ namespace Content.Server.Bed.Sleep
SubscribeLocalEvent<MobStateComponent, SleepStateChangedEvent>(OnSleepStateChanged); SubscribeLocalEvent<MobStateComponent, SleepStateChangedEvent>(OnSleepStateChanged);
SubscribeLocalEvent<SleepingComponent, DamageChangedEvent>(OnDamageChanged); SubscribeLocalEvent<SleepingComponent, DamageChangedEvent>(OnDamageChanged);
SubscribeLocalEvent<MobStateComponent, SleepActionEvent>(OnSleepAction); SubscribeLocalEvent<MobStateComponent, SleepActionEvent>(OnSleepAction);
SubscribeLocalEvent<ActionsContainerComponent, SleepActionEvent>(OnBedSleepAction);
SubscribeLocalEvent<MobStateComponent, WakeActionEvent>(OnWakeAction); SubscribeLocalEvent<MobStateComponent, WakeActionEvent>(OnWakeAction);
SubscribeLocalEvent<SleepingComponent, MobStateChangedEvent>(OnMobStateChanged); SubscribeLocalEvent<SleepingComponent, MobStateChangedEvent>(OnMobStateChanged);
SubscribeLocalEvent<SleepingComponent, GetVerbsEvent<AlternativeVerb>>(AddWakeVerb); SubscribeLocalEvent<SleepingComponent, GetVerbsEvent<AlternativeVerb>>(AddWakeVerb);
@@ -93,6 +94,11 @@ namespace Content.Server.Bed.Sleep
TrySleeping(uid); TrySleeping(uid);
} }
private void OnBedSleepAction(EntityUid uid, ActionsContainerComponent component, SleepActionEvent args)
{
TrySleeping(args.Performer);
}
private void OnWakeAction(EntityUid uid, MobStateComponent component, WakeActionEvent args) private void OnWakeAction(EntityUid uid, MobStateComponent component, WakeActionEvent args)
{ {
if (!TryWakeCooldown(uid)) if (!TryWakeCooldown(uid))