aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e589e7c3365..edceb7440ab 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -4040,7 +4040,13 @@ void Unit::RemoveAurasWithMechanic(uint64 mechanicMaskToRemove, AuraRemoveMode r
}, removeMode);
for (Aura* aura : aurasToUpdateTargets)
+ {
aura->UpdateTargetMap(aura->GetCaster());
+
+ // Fully remove the aura if all effects were removed
+ if (!aura->IsPassive() && aura->GetOwner() == this && !aura->GetApplicationOfTarget(GetGUID()))
+ aura->Remove(removeMode);
+ }
}
void Unit::RemoveAurasByShapeShift()