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

Fix ambiance error (#7101)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-14 02:03:27 +13:00
committed by GitHub
parent 022c0abfe9
commit 466f236bce
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Client/Audio/AmbientSoundSystem.cs
View File

@@ -51,6 +51,14 @@ namespace Content.Client.Audio
configManager.OnValueChanged(CCVars.AmbientCooldown, SetCooldown, true); configManager.OnValueChanged(CCVars.AmbientCooldown, SetCooldown, true);
configManager.OnValueChanged(CCVars.MaxAmbientSources, SetAmbientCount, true); configManager.OnValueChanged(CCVars.MaxAmbientSources, SetAmbientCount, true);
configManager.OnValueChanged(CCVars.AmbientRange, SetAmbientRange, true); configManager.OnValueChanged(CCVars.AmbientRange, SetAmbientRange, true);
SubscribeLocalEvent<AmbientSoundComponent, ComponentShutdown>(OnShutdown);
}
private void OnShutdown(EntityUid uid, AmbientSoundComponent component, ComponentShutdown args)
{
if (_playingSounds.Remove(component, out var sound))
sound.Stream?.Stop();
} }
private void SetCooldown(float value) => _cooldown = value; private void SetCooldown(float value) => _cooldown = value;
@@ -226,12 +234,13 @@ namespace Content.Client.Audio
foreach (var (comp, sound) in _playingSounds) foreach (var (comp, sound) in _playingSounds)
{ {
var entity = comp.Owner; var entity = comp.Owner;
if (!comp.Enabled || if (comp.Deleted || // includes entity deletion
!comp.Enabled ||
!EntityManager.GetComponent<TransformComponent>(entity).Coordinates !EntityManager.GetComponent<TransformComponent>(entity).Coordinates
.TryDistance(EntityManager, coordinates, out var range) || .TryDistance(EntityManager, coordinates, out var range) ||
range > comp.Range) range > comp.Range)
{ {
_playingSounds[comp].Stream?.Stop(); sound.Stream?.Stop();
_playingSounds.Remove(comp); _playingSounds.Remove(comp);
} }
} }