1 files changed, 5 insertions, 2 deletions
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index 69a8572e7a5..560fb4d651e 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -294,7 +294,12 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
     else                                                    // creature charmed
     {
         if(Map *map = mover->GetMap())
+        {
+            //if(GetPlayer()->m_seer != mover)
+            if(((Creature*)mover)->isVehicle())
+                map->PlayerRelocation(GetPlayer(), movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
             map->CreatureRelocation((Creature*)mover, movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
+        }
         mover->SetUnitMovementFlags(movementInfo.flags);
     }
 }
@@ -435,8 +440,6 @@ void WorldSession::HandleDismissControlledVehicle(WorldPacket &recv_data)
     if(Vehicle *vehicle = ObjectAccessor::GetVehicle(vehicleGUID))
     {
         _player->ExitVehicle(vehicle);
-        if(!vehicle->GetDBTableGUIDLow())
-            vehicle->Dismiss();
     }
 }