From 9f6dfa282faff2fadb377a1dae0af9c0c519cb5e Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Wed, 12 Aug 2009 05:17:37 +0400 Subject: [PATCH] [8353] Prevent reporting about wrong stacking in log for spell 33076 and ranks. Using new delayed aura deleted functionality remove source aura before cast triggred aura. --- src/game/Unit.cpp | 5 +++++ src/shared/revision_nr.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 49c3b1a69..1c6bd9a0b 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -11854,9 +11854,14 @@ bool Unit::HandleMeandingAuraProc( Aura* triggeredByAura ) mod->mask = spellProto->SpellFamilyFlags; mod->mask2 = spellProto->SpellFamilyFlags2; + // remove before apply next (locked against deleted) + triggeredByAura->SetInUse(true); + RemoveAurasByCasterSpell(spellProto->Id,caster->GetGUID()); + caster->AddSpellMod(mod, true); CastCustomSpell(target,spellProto->Id,&heal,NULL,NULL,true,NULL,triggeredByAura,caster->GetGUID()); caster->AddSpellMod(mod, false); + triggeredByAura->SetInUse(false); } } } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5821392c9..587ddbe48 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 "8352" + #define REVISION_NR "8353" #endif // __REVISION_NR_H__