diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2016-10-28 03:54:18 -0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2016-10-28 03:54:18 -0300 |
| commit | f90ba4c864fe395cf895d5ce737abe0839c63348 (patch) | |
| tree | 91604671905fa058d5db52e923127691b3a3b8a3 | |
| parent | b5ef85d9422e3463f626241f4a14c45f58fd2515 (diff) | |
Core/Auras: fix removal of Master of Subtlety/Overkill auras
Ref #806
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.cpp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 35a8f97b445..3f4d19f09d9 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -5443,13 +5443,11 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const { // Master of Subtlety case 31666: - if (!target->HasAuraType(SPELL_AURA_MOD_STEALTH)) - target->RemoveAurasDueToSpell(31665); + target->RemoveAurasDueToSpell(31665); break; // Overkill case 58428: - if (!target->HasAuraType(SPELL_AURA_MOD_STEALTH)) - target->RemoveAurasDueToSpell(58427); + target->RemoveAurasDueToSpell(58427); break; } break; diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 2d8916463a4..0b802972616 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1591,6 +1591,9 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b target->CastSpell(target, 31666, true); else { + // Remove counter aura + target->RemoveAurasDueToSpell(31666); + int32 basepoints0 = aurEff->GetAmount(); target->CastCustomSpell(target, 31665, &basepoints0, NULL, NULL, true); } @@ -1601,7 +1604,12 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b if (!apply) target->CastSpell(target, 58428, true); else + { + // Remove counter aura + target->RemoveAurasDueToSpell(58428); + target->CastSpell(target, 58427, true); + } } break; } |