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

[Combat] Let people melee attack themselves (#15272)

Browse Source
This commit is contained in:
Kara
2023-04-10 14:28:27 -07:00
committed by GitHub
parent f796933b9e
commit 4ceb45d171
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,10 +418,8 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
{ {
var damage = component.Damage * GetModifier(component, true); var damage = component.Damage * GetModifier(component, true);
// Can't attack yourself
// For consistency with wide attacks stuff needs damageable. // For consistency with wide attacks stuff needs damageable.
if (user == ev.Target || if (Deleted(ev.Target) ||
Deleted(ev.Target) ||
!HasComp<DamageableComponent>(ev.Target) || !HasComp<DamageableComponent>(ev.Target) ||
!TryComp<TransformComponent>(ev.Target, out var targetXform) || !TryComp<TransformComponent>(ev.Target, out var targetXform) ||
// Not in LOS. // Not in LOS.