combined MeleeHitEvent and ItemMeleeDamageEvent (#11628)

Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
2022-11-03 13:01:08 +01:00
parent 6c834c5371
commit e3579c99f5
10 changed files with 32 additions and 53 deletions
--- a/Content.Server/Damage/Systems/StaminaSystem.cs
+++ b/Content.Server/Damage/Systems/StaminaSystem.cs
@@ -90,6 +90,9 @@ public sealed class StaminaSystem : EntitySystem

    private void OnHit(EntityUid uid, StaminaDamageOnHitComponent component, MeleeHitEvent args)
    {
+        if (!args.IsHit)
+            return;
+
        if (component.Damage <= 0f) return;

        var ev = new StaminaDamageOnHitAttemptEvent();