From 52b3f66b3843d6a3d8a8aa71f1f82d9b64b0ccf1 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Mon, 27 Jun 2011 01:56:50 +0400 Subject: [PATCH] [11683] More consitence use m_target for DestroyItemWithOnStoreSpell call in aura. This don't must be cases when caster != m_target but anyway not reason have not nice look code. --- src/game/SpellAuras.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index f0eafb729..36ab9b59b 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -8575,10 +8575,10 @@ void SpellAuraHolder::_RemoveSpellAuraHolder() dynObj->RemoveAffected(m_target); // remove at-store spell cast items (for all remove modes?) - if (caster && caster->GetTypeId() == TYPEID_PLAYER && m_removeMode != AURA_REMOVE_BY_DEFAULT && m_removeMode != AURA_REMOVE_BY_DELETE) + if (m_target->GetTypeId() == TYPEID_PLAYER && m_removeMode != AURA_REMOVE_BY_DEFAULT && m_removeMode != AURA_REMOVE_BY_DELETE) if (ObjectGuid castItemGuid = GetCastItemGuid()) if (Item* castItem = ((Player*)m_target)->GetItemByGuid(castItemGuid)) - ((Player*)caster)->DestroyItemWithOnStoreSpell(castItem); + ((Player*)m_target)->DestroyItemWithOnStoreSpell(castItem); //passive auras do not get put in slots - said who? ;) // Note: but totem can be not accessible for aura target in time remove (to far for find in grid) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b2e00ad3d..7ef74adc3 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 "11682" + #define REVISION_NR "11683" #endif // __REVISION_NR_H__