*Merge.

--HG-- branch : trunk
2009-03-26 21:54:14 -06:00
parent cd7376c706 52a5c5e8e3
commit e9bdfa4d02
4 changed files with 19 additions and 18 deletions
@@ -1756,17 +1756,6 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati

            ResetContestedPvP();

-            /*DestroyForNearbyPlayers();
-            {
-                UpdateData data;
-                for(ClientGUIDs::iterator i = m_clientGUIDs.begin(); i != m_clientGUIDs.end(); ++i)
-                    data.AddOutOfRangeGUID(*i);
-                WorldPacket packet;
-                data.BuildPacket(&packet);
-                GetSession()->SendPacket(&packet);
-            }*/
-            m_clientGUIDs.clear();
-
            // remove player from battleground on far teleport (when changing maps)
            if(BattleGround const* bg = GetBattleGround())
            {