diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2020-09-06 01:22:19 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-05 13:08:46 +0100 |
| commit | 970cd097de3a12a15094faf615acbac6c55e391c (patch) | |
| tree | 6665d266bc51b398180ada64f5c2b08e538d2d65 | |
| parent | b45277f1cf52483f0471f4aa79ca6b288180ee7c (diff) | |
Core/Combat: When entering a vehicle, transfer any current threat to that vehicle. Closes #1340.
(cherry picked from commit 47c7910036d5a32a92aa58b48553a1b8c8891e08)
| -rw-r--r-- | src/server/game/Entities/Vehicle/Vehicle.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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()) |