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

Fix melee sound prediction (#12598)

Browse Source
This commit is contained in:
metalgearsloth
2022-11-15 11:56:10 +11:00
committed by GitHub
parent 0986bfa7be
commit 8aefee0f39
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
View File

@@ -557,7 +557,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (appliedDamage.Total > FixedPoint2.Zero) if (appliedDamage.Total > FixedPoint2.Zero)
{ {
RaiseNetworkEvent(new DamageEffectEvent(Color.Red, targets), Filter.Pvs(Transform(targets[0]).Coordinates, entityMan: EntityManager)); DoDamageEffect(targets, user, Transform(targets[0]));
} }
} }
@@ -635,14 +635,14 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
case "Burn": case "Burn":
case "Heat": case "Heat":
case "Cold": case "Cold":
Audio.PlayPvs(new SoundPathSpecifier("/Audio/Items/welder.ogg"), target, AudioParams.Default.WithVariation(DamagePitchVariation)); Audio.PlayPredicted(new SoundPathSpecifier("/Audio/Items/welder.ogg"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
break; break;
// No damage, fallback to tappies // No damage, fallback to tappies
case null: case null:
Audio.PlayPvs(new SoundPathSpecifier("/Audio/Weapons/tap.ogg"), target, AudioParams.Default.WithVariation(DamagePitchVariation)); Audio.PlayPredicted(new SoundPathSpecifier("/Audio/Weapons/tap.ogg"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
break; break;
case "Brute": case "Brute":
Audio.PlayPvs(new SoundPathSpecifier("/Audio/Weapons/smash.ogg"), target, AudioParams.Default.WithVariation(DamagePitchVariation)); Audio.PlayPredicted(new SoundPathSpecifier("/Audio/Weapons/smash.ogg"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
break; break;
} }
} }