From f228a1c08d72a537b28874f44bba985d7345cbaf Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Mon, 13 Dec 2010 07:22:12 +0300 Subject: [PATCH] [10866] Unsummon guardians at re-cast only for non-triggered case. --- src/game/SpellEffects.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 8e997adc3..4d432f6f1 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -4628,8 +4628,8 @@ void Spell::DoSummonGuardian(SpellEffectIndex eff_idx, uint32 forceFaction) PetType petType = propEntry->Title == UNITNAME_SUMMON_TITLE_COMPANION ? PROTECTOR_PET : GUARDIAN_PET; - // second cast unsummon guardian(s) (guardians without like functionality have cooldown > spawn time) - if (m_caster->GetTypeId() == TYPEID_PLAYER) + // second direct cast unsummon guardian(s) (guardians without like functionality have cooldown > spawn time) + if (!m_IsTriggeredSpell && m_caster->GetTypeId() == TYPEID_PLAYER) { bool found = false; // including protector diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index d7435ce76..431265b06 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 "10865" + #define REVISION_NR "10866" #endif // __REVISION_NR_H__