diff options
| author | raczman <raczman@users.noreply.github.com> | 2013-09-18 09:17:49 -0700 |
|---|---|---|
| committer | raczman <raczman@users.noreply.github.com> | 2013-09-18 09:17:49 -0700 |
| commit | c9c12b9867d82558f9af9ac81b95a4a5838a6a15 (patch) | |
| tree | 85e857b0588158386d7df2e1ae458fb63991eb8e | |
| parent | aa6736cfcc23447995a71635d6c3b852e7277aba (diff) | |
| parent | cac1968ab752a0eaa22226a92a5ec611f040233c (diff) | |
Merge pull request #10864 from zorix/auras
Core/Auras: Fix removing auras when player reset talents or changing/leaving shapeshift
Close #10763
Close #10809
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9bdc1ebdfc5..75bdce22ddf 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4028,7 +4028,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank) itr->second->state = PLAYERSPELL_REMOVED; } - RemoveAurasDueToSpell(spell_id); + RemoveOwnedAura(spell_id, GetGUID()); // remove pet auras for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index ff4a3b5ca71..4b73af1b681 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1254,9 +1254,9 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const else { if (spellId) - target->RemoveAurasDueToSpell(spellId); + target->RemoveOwnedAura(spellId, target->GetGUID()); if (spellId2) - target->RemoveAurasDueToSpell(spellId2); + target->RemoveOwnedAura(spellId2, target->GetGUID()); // Improved Barkskin - apply/remove armor bonus due to shapeshift if (Player* player=target->ToPlayer()) |