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

Core/Pet: Fix pet at rest distance (#17206)

Browse Source 
* Core/Pet: Fix pet at rest distance

By MrSmite, closes #10865

* Update TargetedMovementGenerator.cpp
This commit is contained in:
Aokromes
2016-06-18 14:21:43 +02:00
committed by GitHub
parent ce236d37c8
commit b2effe4460
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
View File

@@ -73,8 +73,8 @@ void TargetedMovementGeneratorMedium<T, D>::_setTargetLocation(T* owner, bool up
// doing a "dance" while fighting
if (owner->IsPet() && i_target->GetTypeId() == TYPEID_PLAYER)
{
dist = i_target->GetCombatReach();
size = i_target->GetCombatReach() - i_target->GetObjectSize();
dist = 1.0f; //i_target->GetCombatReach();
size = 1.0f; //i_target->GetCombatReach() - i_target->GetObjectSize();
}
else
{
@@ -168,8 +168,15 @@ bool TargetedMovementGeneratorMedium<T, D>::DoUpdate(T* owner, uint32 time_diff)
if (i_recheckDistance.Passed())
{
i_recheckDistance.Reset(100);
//More distance let have better performance, less distance let have more sensitive reaction at target move.
float allowed_dist = owner->GetCombatReach() + sWorld->getRate(RATE_TARGET_POS_RECALCULATION_RANGE);
float allowed_dist = 0.0f;
if (owner->IsPet() && (owner->GetCharmerOrOwnerGUID() == i_target->GetGUID()))
allowed_dist = 1.0f; // pet following owner
else
allowed_dist = owner->GetCombatReach() + sWorld->getRate(RATE_TARGET_POS_RECALCULATION_RANGE);
G3D::Vector3 dest = owner->movespline->FinalDestination();
if (owner->movespline->onTransport)
if (TransportBase* transport = owner->GetDirectTransport())