diff options
| author | QAston <none@none> | 2009-08-13 21:24:56 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-08-13 21:24:56 +0200 |
| commit | e2374e8bdb358922760e6e14b2c4744c085d5dd1 (patch) | |
| tree | 9e6f8da7c355e91a3883831b0cc83af0447663b1 /src/game/SpellAuras.cpp | |
| parent | 25f81cdfcdfe42aafd9589f3c6f447141a321a2e (diff) | |
*Use m_caster as caster of triggered spell in EffectTriggerSpell handler.
*Correct stance check in handleShapeshiftBoosts - by Sarjuuk
*Minor cleanup in Unit.cpp.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellAuras.cpp')
| -rw-r--r-- | src/game/SpellAuras.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index ed5edbaad3e..206abe128bb 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -770,9 +770,6 @@ void AreaAuraEffect::Update(uint32 diff) for(std::list<Unit*>::iterator tIter = targets.begin(); tIter != targets.end(); tIter++) { - // Unit has aura from self - do not replace it - if ((*tIter)->HasAura(GetId(), m_target->GetGUID())) - continue; if(Aura *aur = (*tIter)->GetAura(GetId(), GetCasterGUID())) { if(aur->HasEffect(GetEffIndex())) @@ -1943,14 +1940,14 @@ void AuraEffect::HandleShapeshiftBoosts(bool apply) if(itr->first==spellId || itr->first==spellId2) continue; SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first); if (!spellInfo || !(spellInfo->Attributes & (SPELL_ATTR_PASSIVE | (1<<7)))) continue; - if (spellInfo->Stances & (1<<form)) + if (spellInfo->Stances & (1<<(form-1))) m_target->CastSpell(m_target, itr->first, true, NULL, this); } //LotP if (((Player*)m_target)->HasSpell(17007)) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(24932); - if (spellInfo && spellInfo->Stances & (1<<form)) + if (spellInfo && spellInfo->Stances & (1<<(form-1))) m_target->CastSpell(m_target, 24932, true, NULL, this); } // HotW |