From edb6560cae6c816a9138845afbffd0c4d6cb9304 Mon Sep 17 00:00:00 2001 From: Deserty0 <86846189+Deserty0@users.noreply.github.com> Date: Sat, 19 Jul 2025 04:35:19 +1000 Subject: [PATCH] fix client spam from magic (#1547) * fix * 123 --- Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs index 81293f9e99..444c587e3e 100644 --- a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs +++ b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs @@ -5,6 +5,7 @@ using Content.Shared._CP14.MagicSpell.Components; using Content.Shared._CP14.MagicSpell.Events; using Content.Shared._CP14.MagicSpell.Spells; using Content.Shared._CP14.MagicVision; +using Content.Shared.Access.Components; using Content.Shared.Actions; using Content.Shared.Actions.Components; using Content.Shared.Damage.Systems; @@ -12,6 +13,7 @@ using Content.Shared.DoAfter; using Content.Shared.FixedPoint; using Content.Shared.Movement.Systems; using Content.Shared.Popups; +using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -34,6 +36,7 @@ public abstract partial class CP14SharedMagicSystem : EntitySystem [Dependency] private readonly SharedStaminaSystem _stamina = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly CP14SharedMagicVisionSystem _magicVision = default!; + [Dependency] private readonly INetManager _net = default!; private EntityQuery _magicContainerQuery; private EntityQuery _magicEffectQuery; @@ -68,6 +71,9 @@ public abstract partial class CP14SharedMagicSystem : EntitySystem private void OnEndCast(Entity ent, ref CP14EndCastMagicEffectEvent args) { + if (!_net.IsServer) + return; + if (!TryComp(args.Performer, out var caster)) return;