From 27f2baca1d3d5023ee298c29819ddfcb148874e7 Mon Sep 17 00:00:00 2001 From: Kapoeira Date: Thu, 12 Jan 2012 02:21:44 -0500 Subject: [PATCH] Scripts/Arenas: Also prevent bugs with Spirit of Redemption. Meh. Three commits for this. My bad. Farewell TrinityCore. :( --- src/server/game/Battlegrounds/Battleground.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 59cfed42ab..5012a0f866 100755 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -793,14 +793,14 @@ void Battleground::EndBattleground(uint32 winner) if (!player) continue; - // Last standing - Rated 5v5 arena & be solely alive player - if (team == winner && isArena() && isRated() && GetArenaType() == ARENA_TYPE_5v5 && aliveWinners == 1 && player->isAlive()) - player->CastSpell(player, SPELL_THE_LAST_STANDING, true); - // should remove spirit of redemption if (player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION)) player->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT); + // Last standing - Rated 5v5 arena & be solely alive player + if (team == winner && isArena() && isRated() && GetArenaType() == ARENA_TYPE_5v5 && aliveWinners == 1 && player->isAlive()) + player->CastSpell(player, SPELL_THE_LAST_STANDING, true); + if (!player->isAlive()) { player->ResurrectPlayer(1.0f);