Core/Auras: Renamed spell aura 333 to better describe its purpose
(cherry picked from commit c2f6c4d2bd6f06e382c27ca256fcffaa3f0d498b) Conflicts: src/server/game/Entities/Unit/Unit.cpp
This commit is contained in:
1 parent
badef62df4
commit
61c72215c3
3 files changed
+9
-7
No files matched your search
@@ -17118,14 +17118,16 @@ void Unit::Whisper(uint32 textId, Player* target, bool isBossWhisper /*= false*/
|
||||
SpellInfo const* Unit::GetCastSpellInfo(SpellInfo const* spellInfo) const
|
||||
{
|
||||
Unit::AuraEffectList swaps = GetAuraEffectsByType(SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS);
|
||||
Unit::AuraEffectList const& swaps2 = GetAuraEffectsByType(SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_2);
|
||||
Unit::AuraEffectList const& swaps2 = GetAuraEffectsByType(SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_TRIGGERED);
|
||||
if (!swaps2.empty())
|
||||
swaps.insert(swaps.end(), swaps2.begin(), swaps2.end());
|
||||
|
||||
for (AuraEffect const* aurEff : swaps)
|
||||
if (aurEff->IsAffectingSpell(spellInfo))
|
||||
if (SpellInfo const* newInfo = sSpellMgr->GetSpellInfo(aurEff->GetAmount()))
|
||||
for (AuraEffect const* auraEffect : swaps)
|
||||
{
|
||||
if (uint32(auraEffect->GetMiscValue()) == spellInfo->Id || auraEffect->IsAffectingSpell(spellInfo))
|
||||
if (SpellInfo const* newInfo = sSpellMgr->GetSpellInfo(auraEffect->GetAmount()))
|
||||
return newInfo;
|
||||
}
|
||||
|
||||
return spellInfo;
|
||||
}
|
||||
Reference in new issue
Block a user