From 8e702b4b2efc9a7298b0c78459f34df305ff67c6 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 23 Nov 2017 21:44:10 +0100 Subject: [PATCH] Core/Spells: Fix timer for triggered spells By Malcrom --- src/server/game/Spells/Spell.cpp | 2 +- src/server/game/Spells/SpellEffects.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 8e2082fa33..1dcfb50854 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4959,7 +4959,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint if (!m_caster->GetSpellHistory()->IsReady(m_spellInfo, m_castItemEntry, IsIgnoringCooldowns())) { - if (m_triggeredByAuraSpell) + if (IsTriggered() || m_triggeredByAuraSpell) return SPELL_FAILED_DONT_REPORT; else return SPELL_FAILED_NOT_READY; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index f4cea585df..cd19cb49f7 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -820,7 +820,7 @@ void Spell::EffectForceCast(SpellEffIndex effIndex) SpellCastTargets targets; targets.SetUnitTarget(m_caster); - unitTarget->CastSpell(targets, spellInfo, &values, TRIGGERED_FULL_MASK); + unitTarget->CastSpell(targets, spellInfo, &values, TriggerCastFlags(TRIGGERED_FULL_MASK & ~TRIGGERED_IGNORE_SPELL_AND_CATEGORY_CD)); } void Spell::EffectTriggerRitualOfSummoning(SpellEffIndex effIndex)