diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Battlegrounds/Battleground.cpp | 1 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index bb229516f5c..0494359a25e 100755 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -1104,7 +1104,6 @@ void Battleground::AddPlayer(Player *plr) // add arena specific auras if (isArena()) { - plr->RemoveArenaAuras(); plr->RemoveArenaEnchantments(TEMP_ENCHANTMENT_SLOT); if (team == ALLIANCE) // gold { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index d023b644ad8..ea06570c68f 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1981,9 +1981,14 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati LeaveBattleground(false); // don't teleport to entry point } - // remove arena spell coldowns now to also remove pet's cooldowns before it's temporarily unsummoned + // remove arena spell coldowns/buffs now to also remove pet's cooldowns before it's temporarily unsummoned if (mEntry->IsBattleArena()) + { RemoveArenaSpellCooldowns(true); + RemoveArenaAuras(); + if (pet) + pet->RemoveArenaAuras(); + } // remove pet on map change if (pet) |