aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2014-08-16 18:17:46 +0200
committerjackpoz <giacomopoz@gmail.com>2014-08-16 18:17:46 +0200
commitcb53d64191c71713aaee91084a4e7f6a78873e3a (patch)
treefe226662a6411b35c0c95867e0cb5d5abb96c881
parent7cb72c2aacbb3c2502bd5d25a52a6e96fe2b9cc8 (diff)
parentae97b50af2d4765322aa8ccb0a2399a5e4c26d7d (diff)
Merge pull request #12847 from ShinDarth/tc_fix_mount_abuse_after_bg
Core/Battleground: fixed possible mount abuse after leaving BG
-rw-r--r--src/server/game/Battlegrounds/Battleground.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index 86236cd0f2b..3a59ffa8cf9 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -844,12 +844,14 @@ void Battleground::RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPac
Player* player = ObjectAccessor::FindPlayer(guid);
- // should remove spirit of redemption
if (player)
{
+ // should remove spirit of redemption
if (player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
player->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
+ player->RemoveAurasByType(SPELL_AURA_MOUNTED);
+
if (!player->IsAlive()) // resurrect on exit
{
player->ResurrectPlayer(1.0f);