Core/Vehicles: Treat entering other vehicles mounted on main vehicle as swapping seats

This commit is contained in:
Shauren
2020-12-28 11:29:33 +01:00
parent 2e4609f6e1
commit 110564e757

View File

@@ -3023,7 +3023,10 @@ void AuraEffect::HandleAuraControlVehicle(AuraApplication const* aurApp, uint8 m
caster->ToCreature()->DespawnOrUnsummon();
}
if (!(mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT))
bool seatChange = (mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT) // Seat change on the same direct vehicle
|| target->HasAuraType(SPELL_AURA_CONTROL_VEHICLE); // Seat change to a proxy vehicle (for example turret mounted on a siege engine)
if (!seatChange)
caster->_ExitVehicle();
else
target->GetVehicleKit()->RemovePassenger(caster); // Only remove passenger from vehicle without launching exit movement or despawning the vehicle