aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/Unit.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 15ffdf494b2..20025cfcd45 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -4074,6 +4074,12 @@ void Unit::RemoveNotOwnSingleTargetAuras()
void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
{
Aura* Aur = i->second;
+ //aura can be during update when removing, set it to remove at next update
+ if (Aur->IsUpdated())
+ {
+ Aur->RemoveAura();
+ }
+
SpellEntry const* AurSpellInfo = Aur->GetSpellProto();
// some ShapeshiftBoosts at remove trigger removing other auras including parent Shapeshift aura