Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 110564e757)
This commit is contained in:
Shauren
2020-12-28 11:29:33 +01:00
committed by Ovahlord
parent c8d37293e8
commit ef70533e55
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Spells/Auras/SpellAuraEffects.cpp
View File

@@ -3083,7 +3083,10 @@ void AuraEffect::HandleAuraControlVehicle(AuraApplication const* aurApp, uint8 m
caster->ToCreature()->RemoveCorpse();
}
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