]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
fix: don't apply Sleeping during prediction reset (#39061)
authorPerry Fraser <perryprog@users.noreply.github.com>
Thu, 24 Jul 2025 21:10:47 +0000 (17:10 -0400)
committerGitHub <noreply@github.com>
Thu, 24 Jul 2025 21:10:47 +0000 (23:10 +0200)
* fix: don't apply Sleeping during prediction reset

* I'm calling test flake

Content.Shared/Bed/Sleep/SleepingSystem.cs

index e4732f82f93d6039887c4665dd2fc280e157776c..141a130053a0c849f06d49d0e7efb888c22574ad 100644 (file)
@@ -262,7 +262,10 @@ public sealed partial class SleepingSystem : EntitySystem
 
     private void OnStatusEffectApplied(Entity<ForcedSleepingStatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
     {
-        TrySleeping(args.Target);
+        // Applying state check needed so we don't add SleepingComp during
+        // entity reset due to the status effect getting inserted
+        if (!_gameTiming.ApplyingState)
+            TrySleeping(args.Target);
     }
 
     private void Wake(Entity<SleepingComponent> ent)