From 8890a72257d1f3be05278a06201e7d118dfecfa8 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 13 Jan 2025 18:08:20 +0300 Subject: [PATCH] Reapply "fix #744" This reverts commit 03ba5a2c3bbf4ea2ef399a9b0232478f34b72c79. --- .../_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs | 2 +- .../_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs index 5d2339fe8b..6922cc4773 100644 --- a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs +++ b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs @@ -26,7 +26,7 @@ public abstract partial class CP14SharedMagicSystem var fromItem = action.Comp.SpellStorage is not null; - var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, MathF.Max(delayedEffect.CastDelay, 1f), doAfter, action, used: action.Comp.SpellStorage) + var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, MathF.Max(delayedEffect.CastDelay, 1f), doAfter, action, used: action.Comp.SpellStorage, target: doAfter.Target) { BreakOnMove = delayedEffect.BreakOnMove, BreakOnDamage = delayedEffect.BreakOnDamage, diff --git a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs index a5353cc473..aa8893b8b9 100644 --- a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs +++ b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs @@ -72,7 +72,7 @@ public abstract partial class CP14SharedMagicSystem var fromItem = action.Comp.SpellStorage is not null; - var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, toggleable.CastTime, doAfter, action, used: action.Comp.SpellStorage) + var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, toggleable.CastTime, doAfter, action, used: action.Comp.SpellStorage, target: entityTarget) { BreakOnMove = toggleable.BreakOnMove, BreakOnDamage = toggleable.BreakOnDamage,