From 029de5880aad61eff486a8396578765e1f25a3b3 Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Thu, 20 Jun 2024 05:08:56 -0400 Subject: [PATCH 1/4] add a type specifier where one was forgor --- Content.Client/Effects/ColorFlashEffectSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/Effects/ColorFlashEffectSystem.cs b/Content.Client/Effects/ColorFlashEffectSystem.cs index 0570b4951ecf..6e55a5df069f 100644 --- a/Content.Client/Effects/ColorFlashEffectSystem.cs +++ b/Content.Client/Effects/ColorFlashEffectSystem.cs @@ -124,7 +124,7 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev) continue; } - comp = EnsureComp(ent); + var comp = EnsureComp(ent); comp.NetSyncEnabled = false; comp.Color = sprite.Color; From 62a10dea9b88490f467f0ead428a77b53bef2978 Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Thu, 20 Jun 2024 05:24:24 -0400 Subject: [PATCH 2/4] Fix other way because degub conditions --- Content.Client/Effects/ColorFlashEffectSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/Effects/ColorFlashEffectSystem.cs b/Content.Client/Effects/ColorFlashEffectSystem.cs index 6e55a5df069f..83268ad4b326 100644 --- a/Content.Client/Effects/ColorFlashEffectSystem.cs +++ b/Content.Client/Effects/ColorFlashEffectSystem.cs @@ -124,7 +124,7 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev) continue; } - var comp = EnsureComp(ent); + EnsureComp(ent, out comp); comp.NetSyncEnabled = false; comp.Color = sprite.Color; From 1992d52bc8f59d4876083daaee87b3414674279c Mon Sep 17 00:00:00 2001 From: Avery Dobbins Date: Thu, 20 Jun 2024 05:29:21 -0400 Subject: [PATCH 3/4] okay this feels kinda dumb but it does fix it. --- Content.Client/Effects/ColorFlashEffectSystem.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Client/Effects/ColorFlashEffectSystem.cs b/Content.Client/Effects/ColorFlashEffectSystem.cs index 83268ad4b326..ac83a8d04b0a 100644 --- a/Content.Client/Effects/ColorFlashEffectSystem.cs +++ b/Content.Client/Effects/ColorFlashEffectSystem.cs @@ -109,12 +109,13 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev) continue; } -#if DEBUG if (!TryComp(ent, out ColorFlashEffectComponent? comp)) { +#if DEBUG DebugTools.Assert(!_animation.HasRunningAnimation(ent, AnimationKey)); - } #endif + continue; + } _animation.Stop(ent, AnimationKey); var animation = GetDamageAnimation(ent, color, sprite); From d93075b8acf191b83f46d1ac6f8afc3205e54f33 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 20 Jun 2024 19:42:16 +1000 Subject: [PATCH 4/4] Update Content.Client/Effects/ColorFlashEffectSystem.cs --- Content.Client/Effects/ColorFlashEffectSystem.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Content.Client/Effects/ColorFlashEffectSystem.cs b/Content.Client/Effects/ColorFlashEffectSystem.cs index ac83a8d04b0a..956c94652442 100644 --- a/Content.Client/Effects/ColorFlashEffectSystem.cs +++ b/Content.Client/Effects/ColorFlashEffectSystem.cs @@ -114,7 +114,6 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev) #if DEBUG DebugTools.Assert(!_animation.HasRunningAnimation(ent, AnimationKey)); #endif - continue; } _animation.Stop(ent, AnimationKey);