From f5e555082ec54149c486ec100e984ea0cacb3687 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Tue, 8 Aug 2023 23:48:20 -0300
Subject: [PATCH] =?UTF-8?q?fix(Core/Unit):=20Fix=20Arena=20Preparation=20a?=
 =?UTF-8?q?ura=20being=20removed=20on=20player=20ac=E2=80=A6=20(#16925)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(Core/Unit): Fix Arena Preparation aura being removed on player actions
---
 src/server/game/Entities/Unit/Unit.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 42655fc62..2ca014e2e 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -4766,6 +4766,14 @@ void Unit::RemoveAura(AuraApplication* aurApp, AuraRemoveMode mode)
     {
         if (aurApp == iter->second)
         {
+            // Prevent Arena Preparation aura from being removed by player actions
+            // It's an invisibility spell so any interaction/spell cast etc. removes it.
+            // Should only be removed by the arena script, once the match starts.
+            if (aurApp->GetBase()->HasEffectType(SPELL_AURA_ARENA_PREPARATION))
+            {
+                return;
+            }
+
             RemoveAura(iter, mode);
             return;
         }