Don't double apply modifiers when Oni punch people (#3032)

Fansana · Feb 23, 2025 · 4dd5904 · 4dd5904
1 parent 7328bd0
commit 4dd5904
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -220,10 +220,12 @@ public DamageSpecifier GetDamage(EntityUid uid, EntityUid user, MeleeWeaponCompo
 
         // Begin DeltaV additions
         // Allow users of melee weapons to have bonuses applied
-        var userEv = new GetMeleeDamageEvent(uid, new(component.Damage), new(), user);// Floof - removed component.ResistanceBypass arg TODO: figure out why we don't have it
-        RaiseLocalEvent(user, ref userEv);
+        if (user != uid)
+        {
+            RaiseLocalEvent(user, ref ev);
+        }
 
-        return DamageSpecifier.ApplyModifierSets(ev.Damage, ev.Modifiers.Concat(userEv.Modifiers));
+        return DamageSpecifier.ApplyModifierSets(ev.Damage, ev.Modifiers);
         // End DeltaV additions
     }