diff options
| author | treeston <treeston.mmoc@gmail.com> | 2015-10-08 20:11:19 +0200 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2015-11-06 10:59:34 +0100 |
| commit | b6ac8c577c089afbe8e730a020c48a48738efd4b (patch) | |
| tree | 32b5b91aec86b299136505e9309d1a17a162586d /src/server/game | |
| parent | 5f5ac9630c2716b54a584022e0f69b6507138af0 (diff) | |
Scripts/Naxxramas: Faerlina cleanup:
- Move greeting to areatrigger instead of MoveInLineOfSight hack
- Clean up add spawn handling to prevent various glitching with combinations of evade state and add aggro
- Ensure all adds are always pulled alongside the boss and vice versa
- Add missing texts.
- Fix a bug in the core that prevents castable-while-dead spells (such as Widow's Embrace) from appearing on possess bars.
(cherry picked from commit 577fcf356e9cd54fb0490069d7aa26894e9b5db3)
# Conflicts:
# src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index a1a1afe6f74..ee1d68c7fe6 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11901,7 +11901,7 @@ void CharmInfo::InitPossessCreateSpells() { uint32 spellId = _unit->ToCreature()->m_spells[i]; SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); - if (spellInfo && !spellInfo->HasAttribute(SPELL_ATTR0_CASTABLE_WHILE_DEAD)) + if (spellInfo) { if (spellInfo->IsPassive()) _unit->CastSpell(_unit, spellInfo, true); @@ -11929,7 +11929,7 @@ void CharmInfo::InitCharmCreateSpells() uint32 spellId = _unit->ToCreature()->m_spells[x]; SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); - if (!spellInfo || spellInfo->HasAttribute(SPELL_ATTR0_CASTABLE_WHILE_DEAD)) + if (!spellInfo) { _charmspells[x].SetActionAndType(spellId, ACT_DISABLED); continue; |
