From 8568b08350b954afb6603bf2c64897493230f2b1 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 19 Jan 2023 18:16:02 +0100 Subject: Core/Auras: Fully remove auras that had all of their effect suppressed with immunity (cherry picked from commit 835e2918319ed20109992086311a2c146140937f) --- src/server/game/Entities/Unit/Unit.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/server') 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() -- cgit v1.2.3