From 263802381cb1e3cf027e2612e924b92305f74f4b Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Mon, 30 Mar 2026 11:03:32 -0500 Subject: [PATCH] fix(Core/Unit): Skip evade aura removal for player-owned creatures (#25311) Co-authored-by: blinkysc Co-authored-by: Rushor --- src/server/game/Entities/Unit/Unit.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index c1657cfb0..ad38ef15a 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5697,6 +5697,9 @@ void Unit::RemoveAllAurasExceptType(AuraType type) // Xinef: We should not remove passive auras on evade, if npc has player owner (scripted one cast auras) void Unit::RemoveEvadeAuras() { + if (IsCharmedOwnedByPlayerOrPlayer()) + return; + for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();) { Aura const* aura = iter->second->GetBase();