Core/Vehicle: Removing vehicle checks during combat and conditions