aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2015-06-15 21:35:05 +0200
committerDDuarte <dnpd.dd@gmail.com>2015-06-26 03:28:20 +0100
commitd9133adbb7520cc316b59d2071cf30b29d8406fb (patch)
tree8a109ddaf4d352a6b47083c9e0bc32a7541acd7c
parente4e903ba951871927a36526d88da10de04eddb14 (diff)
Core/ChatCommands: Allow to use "tele" command inside of a battleground
Allow GameMasters with ".gm on" tag to use ".tele" command inside of a battleground to tele around. (cherry picked from commit 0b9cd22a6b5a0cca6e3c07dd5ae077ddbdfc3992)
-rw-r--r--src/server/scripts/Commands/cs_tele.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp
index 55562a004ac..09930770f63 100644
--- a/src/server/scripts/Commands/cs_tele.cpp
+++ b/src/server/scripts/Commands/cs_tele.cpp
@@ -319,7 +319,7 @@ public:
}
MapEntry const* map = sMapStore.LookupEntry(tele->mapId);
- if (!map || map->IsBattlegroundOrArena())
+ if (!map || (map->IsBattlegroundOrArena() && (me->GetMapId() != tele->mapId || !me->IsGameMaster())))
{
handler->SendSysMessage(LANG_CANNOT_TELE_TO_BG);
handler->SetSentErrorMessage(true);