diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 37f64479f85..cdb2c2ace75 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12510,16 +12510,9 @@ void Unit::_EnterVehicle(Vehicle* vehicle, int8 seatId, AuraApplication const* a if (vehicle->GetBase()->GetTypeId() == TYPEID_UNIT) { - // If a player entered a vehicle that is part of a formation, remove it from said formation and replace current movement generator with MoveIdle (no movement) + // If a player entered a vehicle that is part of a formation, remove it from said formation if (CreatureGroup* creatureGroup = vehicle->GetBase()->ToCreature()->GetFormation()) - { creatureGroup->RemoveMember(vehicle->GetBase()->ToCreature()); - vehicle->GetBase()->GetMotionMaster()->MoveIdle(); - } - - // If the vehicle has the random movement generator active, replace it with MoveIdle (no movement) so it won't override player control - if (vehicle->GetBase()->GetMotionMaster()->GetCurrentMovementGeneratorType() == RANDOM_MOTION_TYPE) - vehicle->GetBase()->GetMotionMaster()->MoveIdle(); } } @@ -12640,14 +12633,8 @@ void Unit::_ExitVehicle(Position const* exitPosition) GetMotionMaster()->LaunchMoveSpline(std::move(init), EVENT_VEHICLE_EXIT, MOTION_PRIORITY_HIGHEST); if (player) - { player->ResummonPetTemporaryUnSummonedIfAny(); - // When a player exits a creature vehicle, restore its default motion generator (if any) - if (vehicle->GetBase()->GetTypeId() == TYPEID_UNIT) - vehicle->GetBase()->GetMotionMaster()->InitializeDefault(); - } - if (vehicle->GetBase()->HasUnitTypeMask(UNIT_MASK_MINION) && vehicle->GetBase()->GetTypeId() == TYPEID_UNIT) if (((Minion*)vehicle->GetBase())->GetOwner() == this) vehicle->GetBase()->ToCreature()->DespawnOrUnsummon(1); |