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

Small MeleeWeaponSystem cleanup.

Browse Source 
Now it TryGets the entities for lunges.
This commit is contained in:
Vera Aguilera Puerto
2021-03-17 17:44:37 +01:00
parent c455b745ba
commit a93e9e9401
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Client.GameObjects.EntitySystems
if (!EntityManager.TryGetEntity(msg.Attacker, out var attacker))
{
//FIXME: This should never happen.
// FIXME: This should never happen.
Logger.Error($"Tried to play a weapon arc {msg.ArcPrototype}, but the attacker does not exist. attacker={msg.Attacker}, source={msg.Source}");
return;
}
@@ -115,10 +115,15 @@ namespace Content.Client.GameObjects.EntitySystems
private void PlayLunge(PlayLungeAnimationMessage msg)
{
EntityManager
.GetEntity(msg.Source)
.EnsureComponent<MeleeLungeComponent>()
.SetData(msg.Angle);
if (EntityManager.TryGetEntity(msg.Source, out var entity))
{
entity.EnsureComponent<MeleeLungeComponent>().SetData(msg.Angle);
}
else
{
// FIXME: This should never happen.
Logger.Error($"Tried to play a lunge animation, but the entity \"{msg.Source}\" does not exist.");
}
}
}
}