*Merge with Trinity 793.

--HG--
branch : trunk

1 files changed, 13 insertions, 0 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 7c42b48c1fc..de8a1a747a7 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1577,6 +1577,19 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
     if(!InBattleGround() && mEntry->IsBattleGroundOrArena())
         return false;
 
+	// 449 - Champions' Hall (Alliance) // 450 - Hall of Legends (Horde)
+	if(mapid == 449 && GetTeam()==HORDE)
+    {
+        GetSession()->SendNotification(LANG_NO_ENTER_CHAMPIONS_HALL);
+        return false;
+    } 
+
+	if(mapid == 450 && GetTeam() == ALLIANCE)
+	{
+        GetSession()->SendNotification(LANG_NO_ENTER_HALL_OF_LEGENDS);
+        return false;
+    } 
+
     // client without expansion support
     if(GetSession()->Expansion() < mEntry->Expansion())
     {