From 90b81a212e2416f767be3ea06567303d36811449 Mon Sep 17 00:00:00 2001 From: Gooyeth Date: Thu, 8 Mar 2018 08:00:23 -0600 Subject: Core/Player: Do not remove auras from Gamemasters in arenas (#21568) (cherry picked from commit 92b8a870bf423b439806ab39a8d5af0485e60ed8) --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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(); -- cgit v1.2.3