juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: wide swings with resistanceBypass now bypass resists (#38496)

Browse Source
This commit is contained in:
Perry Fraser
2025-07-10 03:48:45 -04:00
committed by GitHub
parent 5e9b9a55eb
commit 80c6650730
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
View File

@@ -578,6 +578,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
var distance = Math.Min(component.Range, direction.Length());
var damage = GetDamage(meleeUid, user, component);
var resistanceBypass = GetResistanceBypass(meleeUid, user, component);
var entities = GetEntityList(ev.Entities);
if (entities.Count == 0)
@@ -682,7 +683,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
RaiseLocalEvent(entity, attackedEvent);
var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin:user);
var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin: user, ignoreResistances: resistanceBypass);
if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero)
{