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

Fix melee animation exception (#12806)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-30 14:40:57 +13:00
committed by GitHub
parent 4f6ead57bf
commit 5f964f02b7
1 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
View File

@@ -125,22 +125,20 @@ public sealed partial class MeleeWeaponSystem
_animation.Stop(user, MeleeLungeKey); _animation.Stop(user, MeleeLungeKey);
_animation.Play(user, lunge, MeleeLungeKey); _animation.Play(user, lunge, MeleeLungeKey);
// Clientside entity to spawn if (localPos == Vector2.Zero || animation == null)
if (animation != null)
{
if (!TryComp<TransformComponent>(user, out var userXform))
return; return;
var coords = userXform.Coordinates; if (!TryComp<TransformComponent>(user, out var userXform) || userXform.MapID == MapId.Nullspace)
var animationUid = Spawn(animation, coords); return;
var animationUid = Spawn(animation, userXform.Coordinates);
if (!TryComp<SpriteComponent>(animationUid, out var sprite)
|| !TryComp<WeaponArcVisualsComponent>(animationUid, out var arcComponent))
return;
if (localPos != Vector2.Zero && TryComp<SpriteComponent>(animationUid, out var sprite))
{
if (TryComp<WeaponArcVisualsComponent>(animationUid, out var arcComponent))
{
sprite.NoRotation = true; sprite.NoRotation = true;
sprite.Rotation = localPos.ToWorldAngle(); sprite.Rotation = localPos.ToWorldAngle();
var distance = Math.Clamp(localPos.Length / 2f, 0.2f, 1f); var distance = Math.Clamp(localPos.Length / 2f, 0.2f, 1f);
switch (arcComponent.Animation) switch (arcComponent.Animation)
@@ -165,9 +163,6 @@ public sealed partial class MeleeWeaponSystem
break; break;
} }
} }
}
}
}
private Animation GetSlashAnimation(SpriteComponent sprite, Angle arc) private Animation GetSlashAnimation(SpriteComponent sprite, Angle arc)
{ {