[7598] Implement proper hide out of range (at another map) transports. Remove duplicate name field. Author: VladimirMangos

--HG--
branch : trunk

1 files changed, 3 insertions, 2 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index eba3626d0f6..b39fb5780e2 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1954,7 +1954,8 @@ void Map::SendInitTransports( Player * player )
 
     for (MapManager::TransportSet::iterator i = tset.begin(); i != tset.end(); ++i)
     {
-        if((*i) != player->GetTransport())                  // send data for current transport in other place
+        // send data for current transport in other place
+        if((*i) != player->GetTransport() && (*i)->GetMapId()==i_id)
         {
             hasTransport = true;
             (*i)->BuildCreateUpdateBlockForPlayer(&transData, player);
@@ -1981,7 +1982,7 @@ void Map::SendRemoveTransports( Player * player )
 
     // except used transport
     for (MapManager::TransportSet::iterator i = tset.begin(); i != tset.end(); ++i)
-        if(player->GetTransport() != (*i))
+        if((*i) != player->GetTransport() && (*i)->GetMapId()!=i_id)
             (*i)->BuildOutOfRangeUpdateBlock(&transData);
 
     WorldPacket packet;