*Merge.

--HG--
branch : trunk

1 files changed, 17 insertions, 0 deletions

diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index 50152de4e97..c400e1f23fc 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -496,6 +496,23 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
     recv_data >> d >> e >> f >> g >> h >> i >> j >> k;
     recv_data >> seat;
     //sLog.outError("change seat %u %u %u %u %u %u %u %u %u %u %u %u", a, b,c,d,e,f,g,h,i,j,k,seat);
+
+    if(seat == GetPlayer()->GetTransSeat())
+        return;
+
+    if(GetPlayer()->m_Vehicle)
+    {
+        if(Vehicle *vehicle = GetPlayer()->m_Vehicle->HasEmptySeat(seat))
+        {
+            GetPlayer()->m_Vehicle->RemovePassenger(GetPlayer());
+            //If the player is going to a turret, the vehicle should be changed
+            GetPlayer()->m_Vehicle = vehicle;
+            if(!vehicle->AddPassenger(GetPlayer(), seat))
+            {
+                assert(false);
+            }
+        }
+    }
 }
 
 void WorldSession::HandleRequestVehicleExit(WorldPacket &recv_data)