diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Entities/Unit/Unit.cpp | 4 | ||||
| -rw-r--r-- | src/scripts/Northrend/Naxxramas/boss_faerlina.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game/Entities/Unit/Unit.cpp b/src/game/Entities/Unit/Unit.cpp index 40cc595000..d0bcf5d290 100644 --- a/src/game/Entities/Unit/Unit.cpp +++ b/src/game/Entities/Unit/Unit.cpp @@ -14502,7 +14502,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); @@ -14532,7 +14532,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; diff --git a/src/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 536f4a2b9c..96961d1ae2 100644 --- a/src/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -90,7 +90,7 @@ public: void EnterCombat(Unit * who) { BossAI::EnterCombat(who); - me->SetInCombatWithZone(); + summons.DoZoneInCombat(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_POISON_BOLT, urand(12000,15000)); events.ScheduleEvent(EVENT_SPELL_RAIN_OF_FIRE, urand(6000,18000)); |