diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-02-13 11:44:37 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-05 22:14:45 +0200 |
| commit | 0654b3b816e64048d540a549cf56e3142292c035 (patch) | |
| tree | a68023abe0a88e1fe0db5a5988729e60d4726e88 | |
| parent | 60b98ecc2734188ddec43798c87cdf8e3b96482d (diff) | |
Check to make sure we aren't dispelling a buff for _all_ dispel types, not just magic. Closes #15321.
(cherry picked from commit 98860911e237e147c6ffb544c730a8c37de000eb)
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index b99f6501665..a9d04725fe6 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -4188,13 +4188,10 @@ void Unit::GetDispellableAuraList(Unit* caster, uint32 dispelMask, DispelCharges if (aura->GetSpellInfo()->GetDispelMask() & dispelMask) { - if (aura->GetSpellInfo()->Dispel == DISPEL_MAGIC) - { - // do not remove positive auras if friendly target - // negative auras if non-friendly target - if (aurApp->IsPositive() == IsFriendlyTo(caster)) - continue; - } + // do not remove positive auras if friendly target + // negative auras if non-friendly target + if (aurApp->IsPositive() == IsFriendlyTo(caster)) + continue; // The charges / stack amounts don't count towards the total number of auras that can be dispelled. // Ie: A dispel on a target with 5 stacks of Winters Chill and a Polymorph has 1 / (1 + 1) -> 50% chance to dispell |