Merge remote-tracking branch 'origin/add/crit-sound' into add/crit-sound

# Conflicts: # Content.Server/_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs
space-sunrise · Jan 15, 2025 · f0658e1 · f0658e1
2 parents 80e9166 + 7bd58a4
commit f0658e1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Content.Server/_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs b/Content.Server/_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs
@@ -32,7 +32,7 @@ private void OnDamage(Entity<CritHeartbeatComponent> ent, ref DamageChangedEvent
         if (!ent.Comp.Enabled)
             return;
 
-        if (!Exists(ent.Comp.AudioStream))
+        if (ent.Comp.AudioStream == null || !Exists(ent.Comp.AudioStream))
             return;
 
         var pitch = Math.Min(1, 100 / args.Damageable.TotalDamage.Float());