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

Fix for thrown items dealing damage twice to first target (#30115)

Browse Source 
* FUCK YOU

* fine

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
This commit is contained in:
Plykiya
2024-07-18 18:08:52 -07:00
committed by GitHub
parent b57174007c
commit 6d18dff33d
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,9 @@ 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)) if (TerminatingOrDeleted(args.Target))
{ return;
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);
// Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying. // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
@@ -53,13 +54,6 @@ namespace Content.Server.Damage.Systems
} }
} }
// TODO: If more stuff touches this then handle it after.
if (TryComp<PhysicsComponent>(uid, out var physics))
{
_thrownItem.LandComponent(args.Thrown, args.Component, physics, false);
}
}
private void OnDamageExamine(EntityUid uid, DamageOtherOnHitComponent component, ref DamageExamineEvent args) private void OnDamageExamine(EntityUid uid, DamageOtherOnHitComponent component, ref DamageExamineEvent args)
{ {
_damageExamine.AddDamageExamine(args.Message, component.Damage, Loc.GetString("damage-throw")); _damageExamine.AddDamageExamine(args.Message, component.Damage, Loc.GetString("damage-throw"));