diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 79b841f53..a118ead6b 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -3603,9 +3603,14 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur) if(i_spellId == spellId) continue; bool is_triggered_by_spell = false; - // prevent triggered aura of removing aura that triggered it + // prevent triggering aura of removing aura that triggered it for(int j = 0; j < 3; ++j) - if (i_spellProto->EffectTriggerSpell[j] == spellProto->Id) + if (i_spellProto->EffectTriggerSpell[j] == spellId) + is_triggered_by_spell = true; + + // prevent triggered aura of removing aura that triggering it (triggered effect early some aura of parent spell + for(int j = 0; j < 3; ++j) + if (spellProto->EffectTriggerSpell[j] == i_spellId) is_triggered_by_spell = true; if (is_triggered_by_spell) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 02cba0ac8..fb4c3393c 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 "8371" + #define REVISION_NR "8372" #endif // __REVISION_NR_H__