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

Fix CanDisarm (#11843)

Browse Source
This commit is contained in:
metalgearsloth
2022-10-15 15:14:07 +11:00
committed by GitHub
parent 635057fb7a
commit a93d6eb5b6
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,8 +243,6 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
weapon.NextAttack += TimeSpan.FromSeconds(1f / weapon.AttackRate);
// Attack confirmed
// Play a sound to give instant feedback; same with playing the animations
Audio.PlayPredicted(weapon.SwingSound, weapon.Owner, user);
switch (attack)
{
@@ -252,7 +250,9 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
DoLightAttack(user, light, weapon);
break;
case DisarmAttackEvent disarm:
DoDisarm(user, disarm, weapon);
if (!DoDisarm(user, disarm, weapon))
return;
break;
case HeavyAttackEvent heavy:
DoHeavyAttack(user, heavy, weapon);
@@ -261,6 +261,9 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
throw new NotImplementedException();
}
// Play a sound to give instant feedback; same with playing the animations
Audio.PlayPredicted(weapon.SwingSound, weapon.Owner, user);
DoLungeAnimation(user, weapon.Angle, attack.Coordinates.ToMap(EntityManager), weapon.Animation);
weapon.Attacking = true;
Dirty(weapon);