prevent stamina damage still going through after pacification cancel

Simple-Station · Jan 5, 2025 · 8b6f064 · 8b6f064
1 parent 8ce4dd9
commit 8b6f064
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Camera;
+using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Events;
@@ -30,13 +31,13 @@ public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<StaminaComponent, BeforeThrowEvent>(OnBeforeThrow);
+            SubscribeLocalEvent<StaminaComponent, BeforeThrowEvent>(OnBeforeThrow, after: [typeof(PacificationSystem)]);
             SubscribeLocalEvent<DamageOtherOnHitComponent, DamageExamineEvent>(OnDamageExamine);
         }
 
         private void OnBeforeThrow(EntityUid uid, StaminaComponent component, ref BeforeThrowEvent args)
         {
-            if (!TryComp<DamageOtherOnHitComponent>(args.ItemUid, out var damage))
+            if (args.Cancelled || !TryComp<DamageOtherOnHitComponent>(args.ItemUid, out var damage))
                 return;
 
             if (component.CritThreshold - component.StaminaDamage <= damage.StaminaCost)