aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGooyeth <migmadmu@hotmail.com>2018-03-08 08:00:23 -0600
committerShauren <shauren.trinity@gmail.com>2018-03-08 15:00:23 +0100
commit92b8a870bf423b439806ab39a8d5af0485e60ed8 (patch)
treeea369c60141b596fb28dbb56724d0749f218bd7e
parent34c3962b09dbb2b7a11e4ff0c08b2ab05ff63762 (diff)
Core/Player: Do not remove auras from Gamemasters in arenas (#21568)
-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 6f5ec8a8f09..d2e66fac891 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1782,7 +1782,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();