tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DamageOtherOnHit.OnDoHit when the target is terminating or deleted (#28690)

Browse Source
This commit is contained in:
DrSmugleaf
2024-06-07 22:53:54 -07:00
committed by GitHub
parent 49496b40e5
commit a7c7cd74ec
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
View File

@@ -31,6 +31,8 @@ namespace Content.Server.Damage.Systems
} }
private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args) private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args)
{
if (!TerminatingOrDeleted(args.Target))
{ {
var dmg = _damageable.TryChangeDamage(args.Target, component.Damage, component.IgnoreResistances, origin: args.Component.Thrower); var dmg = _damageable.TryChangeDamage(args.Target, component.Damage, component.IgnoreResistances, origin: args.Component.Thrower);
@@ -49,6 +51,7 @@ namespace Content.Server.Damage.Systems
var direction = body.LinearVelocity.Normalized(); var direction = body.LinearVelocity.Normalized();
_sharedCameraRecoil.KickCamera(args.Target, direction); _sharedCameraRecoil.KickCamera(args.Target, direction);
} }
}
// TODO: If more stuff touches this then handle it after. // TODO: If more stuff touches this then handle it after.
if (TryComp<PhysicsComponent>(uid, out var physics)) if (TryComp<PhysicsComponent>(uid, out var physics))