From b45166b2d06e20c205d115b94bfea17b3aa92116 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Sun, 29 Sep 2024 13:18:36 +0200 Subject: [PATCH] fix(Core/Battlefield): shapeshift aura removal from players on leaving arena or battleground (#20069) no longer remove shapeshift auras from player on leave --- src/server/game/Battlegrounds/Battleground.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index b9858b350..1e951e4b0 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -1006,6 +1006,10 @@ void Battleground::RemovePlayerAtLeave(Player* player) // BG subclass specific code RemovePlayer(player); + // should remove spirit of redemption + if (player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION)) + player->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT); + // if the player was a match participant if (participant) { @@ -1049,9 +1053,6 @@ void Battleground::RemovePlayerAtLeave(Player* player) } } - // Remove shapeshift auras - player->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT); - player->SetBattlegroundId(0, BATTLEGROUND_TYPE_NONE, PLAYER_MAX_BATTLEGROUND_QUEUES, false, false, TEAM_NEUTRAL); // Xinef: remove all criterias on bg leave