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

Simplify Healing Component deletion.

Browse Source 
I just fixed the bug causing it to need explicit dropping so this hack
can go.
This commit is contained in:
Pieter-Jan Briers
2019-03-21 17:51:25 +01:00
parent e1ca54fc2e
commit 45b803ce41
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/GameObjects/Components/Healing/HealingComponent.cs
View File

@@ -37,7 +37,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
if (attacked.TryGetComponent(out DamageableComponent damagecomponent)) if (attacked.TryGetComponent(out DamageableComponent damagecomponent))
{ {
damagecomponent.TakeHealing(DamageType.Brute, Heal); damagecomponent.TakeHealing(DamageType.Brute, Heal);
DropAndDelete(user); Owner.Delete();
} }
} }
@@ -46,19 +46,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
if (user.TryGetComponent(out DamageableComponent damagecomponent)) if (user.TryGetComponent(out DamageableComponent damagecomponent))
{ {
damagecomponent.TakeHealing(DamageType.Brute, Heal); damagecomponent.TakeHealing(DamageType.Brute, Heal);
DropAndDelete(user); Owner.Delete();
return false; return false;
} }
return false; return false;
} }
void DropAndDelete(IEntity user)
{
if(user.TryGetComponent(out HandsComponent handscomponent))
{
handscomponent.Drop(Owner);
Owner.Delete();
}
}
} }
} }