aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGooyeth <migmadmu@hotmail.com>2018-03-08 08:00:23 -0600
committerShauren <shauren.trinity@gmail.com>2021-08-23 20:03:40 +0200
commit90b81a212e2416f767be3ea06567303d36811449 (patch)
tree7ea1a94519505a2c5bdddb539a2cfbaa21228d9a /src
parent08f4f9b3241240bd02ba828d2fc1eee6de6b145c (diff)
Core/Player: Do not remove auras from Gamemasters in arenas (#21568)
(cherry picked from commit 92b8a870bf423b439806ab39a8d5af0485e60ed8)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index a4afd3a0889..441b6c8bd4d 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1472,7 +1472,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
}
// remove arena spell coldowns/buffs now to also remove pet's cooldowns before it's temporarily unsummoned
- if (mEntry->IsBattleArena())
+ if (mEntry->IsBattleArena() && !IsGameMaster())
{
RemoveArenaSpellCooldowns(true);
RemoveArenaAuras();