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

Fix animation looping bugs. (#29457)

Browse Source 
Summary of the problem is in the corresponding engine commit: a4ea5a4620

This commit requires engine master right now.

I think #29144 is probably the most severe one, but I touched Jittering and RotatingLight too since they seemed sus too.

Fixes #29144

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Pieter-Jan Briers
2024-07-04 10:02:43 +02:00
committed by GitHub
parent bc7907728c
commit 8d015f5c9f
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Jittering/JitteringSystem.cs
View File

@@ -48,6 +48,9 @@ namespace Content.Client.Jittering
if(args.Key != _jitterAnimationKey) if(args.Key != _jitterAnimationKey)
return; return;
if (!args.Finished)
return;
if (TryComp(uid, out AnimationPlayerComponent? animationPlayer) if (TryComp(uid, out AnimationPlayerComponent? animationPlayer)
&& TryComp(uid, out SpriteComponent? sprite)) && TryComp(uid, out SpriteComponent? sprite))
_animationPlayer.Play(uid, animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey); _animationPlayer.Play(uid, animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey);

3
Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
View File

@@ -19,6 +19,9 @@ public sealed class LightBehaviorSystem : EntitySystem
private void OnBehaviorAnimationCompleted(EntityUid uid, LightBehaviourComponent component, AnimationCompletedEvent args) private void OnBehaviorAnimationCompleted(EntityUid uid, LightBehaviourComponent component, AnimationCompletedEvent args)
{ {
if (!args.Finished)
return;
var container = component.Animations.FirstOrDefault(x => x.FullKey == args.Key); var container = component.Animations.FirstOrDefault(x => x.FullKey == args.Key);
if (container == null) if (container == null)

3
Content.Client/Light/EntitySystems/RotatingLightSystem.cs
View File

@@ -69,6 +69,9 @@ public sealed class RotatingLightSystem : SharedRotatingLightSystem
private void OnAnimationComplete(EntityUid uid, RotatingLightComponent comp, AnimationCompletedEvent args) private void OnAnimationComplete(EntityUid uid, RotatingLightComponent comp, AnimationCompletedEvent args)
{ {
if (!args.Finished)
return;
PlayAnimation(uid, comp); PlayAnimation(uid, comp);
} }