*Fix a bug that player can change to an occupied seat on vehicle.

(The commit message of the last rev should be: do not allow player to use unusable vehicle seat)

--HG--
branch : trunk

1 files changed, 5 insertions, 2 deletions

diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index 59d0d263227..53aa5923782 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -517,9 +517,12 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
     recv_data >> seatId;
 
     if(!guid)
-        GetPlayer()->ChangeSeat(-1, seatId > 0);
+        GetPlayer()->ChangeSeat(-1, seatId > 0); // prev/next
     else if(Vehicle *vehicle = ObjectAccessor::GetVehicle(guid))
-        GetPlayer()->EnterVehicle(vehicle, seatId);
+    {
+        if(vehicle->HasEmptySeat(seatId))
+            GetPlayer()->EnterVehicle(vehicle, seatId);
+    }
 }
 
 void WorldSession::HandleRequestVehicleExit(WorldPacket &recv_data)