diff options
| -rw-r--r-- | src/bindings/scripts/scripts/npc/npc_escortAI.cpp | 1 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp index fefe9278322..c8584424414 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp @@ -299,4 +299,5 @@ void npc_escortAI::Start(bool bAttack, bool bDefend, bool bRun, uint64 pGUID) //Disable questgiver flag m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); + m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_ATTACKABLE_2); } diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 81fae9cec47..7a275a143c2 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -331,9 +331,17 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) switch(m_spellInfo->Id) // better way to check unknown { - case 35354://hand of death + case 35354: //Hand of Death { - if(unitTarget && unitTarget->HasAura(38528,0))//protection of elune + if(unitTarget && unitTarget->HasAura(38528,0)) //Protection of Elune + { + damage = 0; + } + break; + } + case 43648: //Electrical Storm + { + if(unitTarget && unitTarget->HasAura(44007, 0)) // Immune Aura { damage = 0; } |