diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-06-25 00:21:27 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-06-28 18:39:31 +0200 |
| commit | db35ae6f435e859002f0763fdaf6e03d48701712 (patch) | |
| tree | 4887d43e782f3e514d2fde8f7f2d69121725ecf3 /src/server/game/Spells/Spell.cpp | |
| parent | 95e3e1daa1aadd83b21ae4125518c85568afd7a8 (diff) | |
Core/Spells: Implemented new trigger flag to cause spells to be instant without also causing other behavior of TRIGGERED_CAST_DIRECTLY (skipping SMSG_SPELL_START, skipping starting GCD)
(cherry picked from commit a885a1fc3c6b894f546b7aee70b5a67932a94486)
# Conflicts:
# src/server/scripts/Spells/spell_priest.cpp
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 158674832b2..52995bf650a 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3526,7 +3526,9 @@ SpellCastResult Spell::prepare(SpellCastTargets const& targets, AuraEffect const // Prepare data for triggers prepareDataForTriggerSystem(); - m_casttime = CallScriptCalcCastTimeHandlers(m_spellInfo->CalcCastTime(this)); + if (!(_triggeredCastFlags & TRIGGERED_IGNORE_CAST_TIME)) + m_casttime = m_spellInfo->CalcCastTime(this); + m_casttime = CallScriptCalcCastTimeHandlers(m_casttime); SpellCastResult movementResult = SPELL_CAST_OK; if (m_caster->IsUnit() && m_caster->ToUnit()->isMoving()) |