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

Fix melee windup persisting in some circumstances (#11625)

Browse Source
This commit is contained in:
metalgearsloth
2022-10-04 12:12:45 +11:00
committed by GitHub
parent 5c48d9257f
commit 649420b641
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,9 @@
using Content.Shared.ActionBlocker; using Content.Shared.ActionBlocker;
using Content.Shared.CombatMode; using Content.Shared.CombatMode;
using Content.Shared.Hands;
using Content.Shared.Hands.Components; using Content.Shared.Hands.Components;
using Content.Shared.Interaction.Events;
using Content.Shared.Inventory.Events;
using Content.Shared.Popups; using Content.Shared.Popups;
using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Melee.Events;
using JetBrains.Annotations; using JetBrains.Annotations;
@@ -34,6 +37,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
SubscribeLocalEvent<MeleeWeaponComponent, ComponentGetState>(OnGetState); SubscribeLocalEvent<MeleeWeaponComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<MeleeWeaponComponent, ComponentHandleState>(OnHandleState); SubscribeLocalEvent<MeleeWeaponComponent, ComponentHandleState>(OnHandleState);
SubscribeLocalEvent<MeleeWeaponComponent, HandDeselectedEvent>(OnMeleeDropped);
SubscribeAllEvent<LightAttackEvent>(OnLightAttack); SubscribeAllEvent<LightAttackEvent>(OnLightAttack);
SubscribeAllEvent<StartHeavyAttackEvent>(OnStartHeavyAttack); SubscribeAllEvent<StartHeavyAttackEvent>(OnStartHeavyAttack);
@@ -43,6 +47,15 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
SubscribeAllEvent<StopAttackEvent>(OnStopAttack); SubscribeAllEvent<StopAttackEvent>(OnStopAttack);
} }
private void OnMeleeDropped(EntityUid uid, MeleeWeaponComponent component, HandDeselectedEvent args)
{
if (component.WindUpStart == null)
return;
component.WindUpStart = null;
Dirty(component);
}
private void OnStopAttack(StopAttackEvent msg, EntitySessionEventArgs args) private void OnStopAttack(StopAttackEvent msg, EntitySessionEventArgs args)
{ {
var user = args.SenderSession.AttachedEntity; var user = args.SenderSession.AttachedEntity;