From 970cd097de3a12a15094faf615acbac6c55e391c Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 6 Sep 2020 01:22:19 +0200 Subject: Core/Combat: When entering a vehicle, transfer any current threat to that vehicle. Closes #1340. (cherry picked from commit 47c7910036d5a32a92aa58b48553a1b8c8891e08) --- src/server/game/Entities/Vehicle/Vehicle.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 4c7b521f064..b2f501db7fe 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -888,6 +888,9 @@ bool VehicleJoinEvent::Execute(uint64, uint32) init.SetTransportEnter(); Passenger->GetMotionMaster()->LaunchMoveSpline(std::move(init), EVENT_VEHICLE_BOARD, MOTION_PRIORITY_HIGHEST); + for (auto const& [guid, threatRef] : Passenger->GetThreatManager().GetThreatenedByMeList()) + threatRef->GetOwner()->GetThreatManager().AddThreat(Target->GetBase(), threatRef->GetThreat(), nullptr, true, true); + if (Creature* creature = Target->GetBase()->ToCreature()) { if (CreatureAI* ai = creature->AI()) -- cgit v1.2.3