diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp | 8 | ||||
| -rw-r--r-- | src/game/SpellAuras.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index 28e8a4d5e6e..d3e890e9a40 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -287,11 +287,11 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI //if(who->HasStealthAura()) // who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - if(Phase != 2) - AttackStart(who); - - if(!m_creature->isInCombat()) + if(!m_creature->isInCombat())//AttackStart() sets UNIT_FLAG_IN_COMBAT, so this msut be before attacking StartEvent(); + + if(Phase != 2) + AttackStart(who); } } } diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 87bb8b326a7..88c2e3e07bd 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -947,7 +947,7 @@ void Aura::HandleAuraSpecificMods(bool apply) // Glyph of Polymorph ( 56375 - Dot Remover ) // Polymorph if (apply && GetCaster()->HasAura(56375) && (m_spellProto->SpellFamilyName == 3 && m_spellProto->SpellFamilyFlags[0] & 0x01000000)) - {
+ { m_target->RemoveAurasByType(SPELL_AURA_PERIODIC_DAMAGE); m_target->RemoveAurasByType(SPELL_AURA_PERIODIC_DAMAGE_PERCENT); return; |