diff options
| author | joschiwald <joschiwald@online.de> | 2014-01-14 12:38:19 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald@online.de> | 2014-01-14 12:38:19 +0100 |
| commit | 5b6b26262f73a459ddc3ae2162f2d704f84ed2cc (patch) | |
| tree | 42239452718064bd91d7c2073995af74aa703289 /src/server/game/Entities/Vehicle | |
| parent | f2fd1e3b2a523cf2fbe050e4177d572dacac312c (diff) | |
Misc: missing changes after merge
Diffstat (limited to 'src/server/game/Entities/Vehicle')
| -rw-r--r-- | src/server/game/Entities/Vehicle/Vehicle.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index cd85b619962..e40f23fc25c 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -520,7 +520,12 @@ Vehicle* Vehicle::RemovePassenger(Unit* unit) _me->RemoveCharmedBy(unit); if (_me->IsInWorld()) - unit->m_movementInfo.ResetTransport(); + { + if (!_me->GetTransport()) + unit->m_movementInfo.ResetTransport(); + else + unit->m_movementInfo.transport = _me->m_movementInfo.transport; + } // only for flyable vehicles if (unit->IsFlying()) |