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

Adds a check for hitSoundOverride in meleeWeaponSystem (#10380)

Browse Source
This commit is contained in:
Júlio César Ueti
2022-08-07 04:10:39 -03:00
committed by GitHub
parent 5513829aff
commit e0ca000225
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
View File

@@ -112,7 +112,9 @@ namespace Content.Server.Weapon.Melee
} }
else else
{ {
SoundSystem.Play(comp.NoDamageSound.GetSound(), Filter.Pvs(owner, entityManager: EntityManager), owner); SoundSystem.Play((hitEvent.HitSoundOverride != null)
? hitEvent.HitSoundOverride.GetSound()
: comp.NoDamageSound.GetSound(), Filter.Pvs(owner, entityManager: EntityManager), owner);
} }
} }
} }
@@ -208,7 +210,9 @@ namespace Content.Server.Weapon.Melee
} }
else else
{ {
SoundSystem.Play(comp.NoDamageSound.GetSound(), Filter.Pvs(owner, entityManager: EntityManager), owner); SoundSystem.Play((hitEvent.HitSoundOverride != null)
? hitEvent.HitSoundOverride.GetSound()
: comp.NoDamageSound.GetSound(), Filter.Pvs(owner, entityManager: EntityManager), owner);
} }
} }
else else