space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stop empty audio system filters from playing sounds for all players (#5444)

Browse Source 
* Fix audio system empty filter bug

* The nullable attributes are lying
This commit is contained in:
Leon Friedrich
2024-09-18 13:44:16 +12:00
committed by GitHub
parent 19a87fb67a
commit afffb33446
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Robust.Server/Audio/AudioSystem.cs
View File

@@ -66,32 +66,26 @@ public sealed partial class AudioSystem : SharedAudioSystem
private void AddAudioFilter(EntityUid uid, AudioComponent component, Filter filter)
{
var count = filter.Count;
DebugTools.Assert(component.IncludedEntities == null);
component.IncludedEntities = new();
if (count == 0)
if (filter.Count == 0)
return;
_pvs.AddSessionOverrides(uid, filter);
var ents = new HashSet<EntityUid>(count);
foreach (var session in filter.Recipients)
{
var ent = session.AttachedEntity;
if (ent == null)
continue;
ents.Add(ent.Value);
if (session.AttachedEntity is {} ent)
component.IncludedEntities.Add(ent);
}
DebugTools.Assert(component.IncludedEntities == null);
component.IncludedEntities = ents;
}
/// <inheritdoc />
public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
{
if (string.IsNullOrEmpty(filename))
return null;
var entity = SetupAudio(filename, audioParams);
AddAudioFilter(entity, entity.Comp, playerFilter);
entity.Comp.Global = true;