nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-15 01:59:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Movement): Rewritten follow movement generator for pets (#7324)

Browse Source 
- Closes #7296
This commit is contained in:
UltraNix
2021-08-24 11:08:50 +02:00
committed by GitHub
parent bbc071aa57
commit 1becd73f09
6 changed files with 209 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13579,29 +13579,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
{
if (GetTypeId() == TYPEID_UNIT)
{
Unit* followed = nullptr;
if (GetMotionMaster()->GetCurrentMovementGeneratorType() == FOLLOW_MOTION_TYPE)
{
followed = static_cast<FollowMovementGenerator<Creature>const*>(GetMotionMaster()->top())->GetTarget();
}
if (followed && !IsInCombat() && !IsVehicle() && !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_POSSESSED) && (IsPet() || IsGuardian() || GetGUID() == followed->GetCritterGUID() || GetCharmerOrOwnerGUID() == followed->GetGUID()))
{
if (followed->GetTypeId() != TYPEID_PLAYER)
{
if (speed < followed->GetSpeedRate(mtype) + 0.1f)
speed = followed->GetSpeedRate(mtype) + 0.1f; // pets derive speed from owner when not in combat
}
else
{
float ownerSpeed = followed->GetSpeedRate(mtype);
if (speed < ownerSpeed || IsWithinDist3d(followed, 10.0f))
speed = ownerSpeed;
speed *= std::min(std::max(1.0f, 0.75f + (GetDistance(followed) - PET_FOLLOW_DIST) * 0.05f), 1.3f);
}
}
else
speed *= ToCreature()->GetCreatureTemplate()->speed_run; // at this point, MOVE_WALK is never reached
speed *= ToCreature()->GetCreatureTemplate()->speed_run; // at this point, MOVE_WALK is never reached
}
// Normalize speed by 191 aura SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED if need