diff options
| author | Subv2112 <s.v.h21@hotmail.com> | 2012-01-22 08:04:39 -0500 |
|---|---|---|
| committer | Subv2112 <s.v.h21@hotmail.com> | 2012-01-22 08:04:39 -0500 |
| commit | 8362e21b2aa7585dc627014e09052d982b1a7fcb (patch) | |
| tree | 009714b31a160c31b1bbd4db1f592f536672a974 /src/server/game/Entities/Vehicle | |
| parent | a3f595ee10d02dda89298fd4193133d77fbf250e (diff) | |
| parent | 78daae91b21ae8705750a253cb9c6eef02a80815 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Entities/Vehicle')
| -rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index b3531d585c3..7e4bebaab95 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -359,7 +359,6 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId) { if (!_me->SetCharmedBy(unit, CHARM_TYPE_VEHICLE)) ASSERT(false); - unit->ToPlayer()->SetMover(this->GetBase()); } if (_me->IsInWorld()) @@ -411,10 +410,7 @@ void Vehicle::RemovePassenger(Unit* unit) unit->ClearUnitState(UNIT_STAT_ONVEHICLE); if (_me->GetTypeId() == TYPEID_UNIT && unit->GetTypeId() == TYPEID_PLAYER && seat->first == 0 && seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_CAN_CONTROL) - { _me->RemoveCharmedBy(unit); - unit->ToPlayer()->SetMover(unit->ToPlayer()); - } if (_me->IsInWorld()) { |