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

Fix incorrect source weapon in stamina damage logs (#15778)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Chief-Engineer
2023-04-27 13:56:51 -05:00
committed by GitHub
parent 4b371ae271
commit 8704707dbd
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Damage/Systems/StaminaSystem.cs
View File

@@ -194,7 +194,7 @@ public sealed class StaminaSystem : EntitySystem
foreach (var (ent, comp) in toHit)
{
var oldDamage = comp.StaminaDamage;
TakeStaminaDamage(ent, damage / toHit.Count, comp, source:args.User, with:ent);
TakeStaminaDamage(ent, damage / toHit.Count, comp, source:args.User, with:args.Weapon);
if (comp.StaminaDamage.Equals(oldDamage))
{
_popup.PopupEntity(Loc.GetString("stamina-resist"), ent, args.User);