Color flash effect fixes (#18952)

Content.Client/Effects/ColorFlashEffectSystem.cs

@@ -2,11 +2,14 @@ using Content.Shared.Effects;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Effects;
 
-public sealed class ColorFlashEffectSystem : EntitySystem
+public sealed class ColorFlashEffectSystem : SharedColorFlashEffectSystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly AnimationPlayerSystem _animation = default!;
 
     /// <summary>
@@ -23,6 +26,14 @@ public sealed class ColorFlashEffectSystem : EntitySystem
         SubscribeLocalEvent<ColorFlashEffectComponent, AnimationCompletedEvent>(OnEffectAnimationCompleted);
     }
 
+    public override void RaiseEffect(Color color, List<EntityUid> entities, Filter filter)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        OnColorFlashEffect(new ColorFlashEffectEvent(color, entities));
+    }
+
     private void OnEffectAnimationCompleted(EntityUid uid, ColorFlashEffectComponent component, AnimationCompletedEvent args)
     {
         if (args.Key != AnimationKey)

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -15,6 +15,7 @@ using Robust.Client.Player;
 using Robust.Client.State;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
 using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -30,6 +31,7 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
     [Dependency] private readonly IStateManager _stateManager = default!;
     [Dependency] private readonly AnimationPlayerSystem _animation = default!;
     [Dependency] private readonly InputSystem _inputSystem = default!;
+    [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
 
     private EntityQuery<TransformComponent> _xformQuery;
 
@@ -167,8 +169,7 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
     protected override void DoDamageEffect(List<EntityUid> targets, EntityUid? user, TransformComponent targetXform)
     {
         // Server never sends the event to us for predictiveeevent.
-        if (_timing.IsFirstTimePredicted)
-            RaiseLocalEvent(new ColorFlashEffectEvent(Color.Red, targets));
+        _color.RaiseEffect(Color.Red, targets, Filter.Local());
     }
 
     protected override bool DoDisarm(EntityUid user, DisarmAttackEvent ev, EntityUid meleeUid, MeleeWeaponComponent component, ICommonSession? session)