diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2020-09-06 01:22:19 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2020-09-06 01:22:19 +0200 |
| commit | 47c7910036d5a32a92aa58b48553a1b8c8891e08 (patch) | |
| tree | f2135c59c1d2763505dd4c031d475cca01d5a50b | |
| parent | ff26027453179448bb972d88a51e565d71e95f3f (diff) | |
Core/Combat: When entering a vehicle, transfer any current threat to that vehicle. Closes #1340.
| -rwxr-xr-x | 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 ffdadaa5fc9..bf4e5dc36a9 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -891,6 +891,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()) |