Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "Refactor Damage to use Protoypes (#4262)"

Browse Source 
This reverts commit 20bf5739a9.
This commit is contained in:
Silver
2021-08-24 00:50:39 -06:00
committed by Silver
parent 20bf5739a9
commit e708091518
121 changed files with 711 additions and 10237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Damage/DamageOtherOnHitSystem.cs
View File

@@ -17,15 +17,7 @@ namespace Content.Server.Damage
if (!args.Target.TryGetComponent(out IDamageableComponent? damageable))
return;
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
damageable.ChangeDamage(component.DamageType, component.Amount, component.IgnoreResistances, args.User);
=======
damageable.TryChangeDamage(component.DamageType, component.Amount, component.IgnoreResistances);
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
damageable.TryChangeDamage(component.DamageType, component.Amount, component.IgnoreResistances);
>>>>>>> refactor-damageablecomponent
}
}
}