From c31a7447711f367fd69d8d5f3c212e0cb742fc00 Mon Sep 17 00:00:00 2001 From: megamage Date: Mon, 17 Aug 2009 16:07:37 -0500 Subject: [PATCH] [8372] Prevent remove triggered spell auras by later applied parent spell auras. Author: VladimirMangos --HG-- branch : trunk --- src/game/Unit.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index a5d2acfd00..8053944f9e 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -3806,10 +3806,17 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur) } bool is_triggered_by_spell = false; - // prevent triggered aura of removing aura that triggered it + // prevent triggering aura of removing aura that triggered it + // prevent triggered aura of removing aura that triggering it (triggered effect early some aura of parent spell for(uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j) - if (i_spellProto->EffectTriggerSpell[j] == spellProto->Id) + { + if (i_spellProto->EffectTriggerSpell[j] == spellProto->Id + || spellProto->EffectTriggerSpell[j] == i_spellProto->Id) // I do not know what is this for + { is_triggered_by_spell = true; + break; + } + } // check if they can stack