diff --git a/Content.Server/Damage/Systems/DamageOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOnHitSystem.cs index 63ef0f92e6..f129a14f79 100644 --- a/Content.Server/Damage/Systems/DamageOnHitSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnHitSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Damage.Components; using Content.Shared.Damage; using Robust.Shared.Player; using Content.Shared.Weapons.Melee.Events; +using System.Linq; namespace Content.Server.Damage.Systems; @@ -17,6 +18,8 @@ public sealed class DamageOnHitSystem : EntitySystem // Looks for a hit, then damages the held item an appropriate amount. private void DamageItem(EntityUid uid, DamageOnHitComponent component, MeleeHitEvent args) { - _damageableSystem.TryChangeDamage(uid, component.Damage, component.IgnoreResistances); + if (args.HitEntities.Any()) { + _damageableSystem.TryChangeDamage(uid, component.Damage, component.IgnoreResistances); + } } }