*Merge.

--HG--
branch : trunk

1 files changed, 9 insertions, 1 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 2d584da26f7..c1b97530320 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1758,7 +1758,15 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
             ResetContestedPvP();
 
-            DestroyForNearbyPlayers();
+            /*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)