Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Vehicle: prevent creature vehicles from following their old movement generator when a player enters them in some cases.

Browse Source 
Closes #21731 and #22368.
This commit is contained in:
Wyrserth
2019-07-07 17:12:22 +02:00
parent 9f6d3e93f9
commit f869c4969e
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -30,6 +30,7 @@
#include "ConditionMgr.h"
#include "CreatureAI.h"
#include "CreatureAIImpl.h"
#include "CreatureGroups.h"
#include "Formulas.h"
#include "GameObjectAI.h"
#include "GameTime.h"
@@ -12506,6 +12507,20 @@ void Unit::_EnterVehicle(Vehicle* vehicle, int8 seatId, AuraApplication const* a
vehicle->GetBase()->RemoveAura(const_cast<AuraApplication*>(aurApp));
return;
}
if (vehicle->GetBase()->GetTypeId() == TYPEID_UNIT)
{
// If a player entered a vehicle that is part of a formation, remove it from said formation and replace current movement generator with MoveIdle (no movement)
if (CreatureGroup* creatureGroup = vehicle->GetBase()->ToCreature()->GetFormation())
{
creatureGroup->RemoveMember(vehicle->GetBase()->ToCreature());
vehicle->GetBase()->GetMotionMaster()->MoveIdle();
}
// If the vehicle has the random movement generator active, replace it with MoveIdle (no movement) so it won't override player control
if (vehicle->GetBase()->GetMotionMaster()->GetCurrentMovementGeneratorType() == RANDOM_MOTION_TYPE)
vehicle->GetBase()->GetMotionMaster()->MoveIdle();
}
}
// If vehicle flag for fixed position set (cannons), or if the following hardcoded units, then set state rooted
@@ -12625,8 +12640,14 @@ void Unit::_ExitVehicle(Position const* exitPosition)
GetMotionMaster()->LaunchMoveSpline(std::move(init), EVENT_VEHICLE_EXIT, MOTION_PRIORITY_HIGHEST);
if (player)
{
player->ResummonPetTemporaryUnSummonedIfAny();
// When a player exits a creature vehicle, restore its default motion generator (if any)
if (vehicle->GetBase()->GetTypeId() == TYPEID_UNIT)
vehicle->GetBase()->GetMotionMaster()->InitializeDefault();
}
if (vehicle->GetBase()->HasUnitTypeMask(UNIT_MASK_MINION) && vehicle->GetBase()->GetTypeId() == TYPEID_UNIT)
if (((Minion*)vehicle->GetBase())->GetOwner() == this)
vehicle->GetBase()->ToCreature()->DespawnOrUnsummon(1);