From 54980328f95c9fd9fb9ba0c29bfc3fcaa4ce0c77 Mon Sep 17 00:00:00 2001 From: Insider42 Date: Fri, 24 Sep 2010 16:55:18 +0200 Subject: [PATCH] [10527] Disable CombatSpell check for triggered spells Signed-off-by: Laise --- src/game/Spell.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 68b3eb7e5..2962c5882 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -4231,8 +4231,8 @@ SpellCastResult Spell::CheckCast(bool strict) if(bg->GetStatus() == STATUS_WAIT_LEAVE) return SPELL_FAILED_DONT_REPORT; - if (m_caster->isInCombat() && IsNonCombatSpell(m_spellInfo)) - return m_triggeredByAuraSpell ? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_AFFECTING_COMBAT; + if (m_caster->isInCombat() && IsNonCombatSpell(m_spellInfo) && !m_IsTriggeredSpell) + return SPELL_FAILED_AFFECTING_COMBAT; if (m_caster->GetTypeId() == TYPEID_PLAYER && !((Player*)m_caster)->isGameMaster() && VMAP::VMapFactory::createOrGetVMapManager()->isLineOfSightCalcEnabled()) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index dc3d414fc..9894f8ea0 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10526" + #define REVISION_NR "10527" #endif // __REVISION_NR_H__