Core/Vehicles: Make the vehicle system more aura driven. Get rid of redundant checks and update relevant data.

Closes #805

1 files changed, 2 insertions, 3 deletions

diff --git a/src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp b/src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp
index 151ae80e975..5e9fc8a1b63 100644
--- a/src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp
@@ -99,7 +99,7 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
             {
                 if (Vehicle *vehicle = vehUnit->GetVehicleKit())
                     if (vehicle->HasEmptySeat(seatId))
-                        GetPlayer()->EnterVehicle(vehicle, seatId);
+                        GetPlayer()->_EnterVehicle(vehicle, seatId);
             }
             break;
         }
@@ -116,7 +116,7 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
             else if (Unit *vehUnit = Unit::GetUnit(*GetPlayer(), guid))
                 if (Vehicle *vehicle = vehUnit->GetVehicleKit())
                     if (vehicle->HasEmptySeat(seatId))
-                        GetPlayer()->EnterVehicle(vehicle, seatId);
+                        GetPlayer()->_EnterVehicle(vehicle, seatId);
             break;
         }
         default:
@@ -200,7 +200,6 @@ void WorldSession::HandleEjectPassenger(WorldPacket &data)
         {
             ASSERT(GetPlayer() == vehicle->GetBase());
             unit->ExitVehicle();
-            unit->AddObjectToRemoveList();
         }
         else
             sLog->outError("Player %u attempted to eject creature GUID %u from non-ejectable seat.", GetPlayer()->GetGUIDLow(), GUID_LOPART(guid));