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/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -43,6 +43,9 @@ namespace Content.Server.Flash

        private void OnFlashMeleeHit(EntityUid uid, FlashComponent comp, MeleeHitEvent args)
        {
+            if (!args.IsHit)
+                return;
+
            if (!UseFlash(comp, args.User))
                return;