Updated: Attempt teleporting passenger first

I hope that this will fix the issue of horses disappearing, but no guarantees.