From 325131c69096d0591d16880bc8f097d8acc39c6e Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 17 Nov 2019 10:11:39 +0100 Subject: [PATCH] Core/Movement: ranged attacking pets should not care about chase angles and tolerances at all * ported some missing fixups for chase movement --- src/server/game/AI/CoreAI/PetAI.cpp | 7 ++++++- src/server/game/Entities/Unit/Unit.cpp | 3 --- .../MovementGenerators/ChaseMovementGenerator .cpp | 10 +++------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index e8dd14fc96..443bfec607 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -487,7 +487,12 @@ void PetAI::DoAttack(Unit* target, bool chase) ClearCharmInfoFlags(); me->GetCharmInfo()->SetIsCommandAttack(oldCmdAttack); // For passive pets commanded to attack so they will use spells me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveChase(target, me->GetPetChaseDistance(), (float)M_PI); + + float chaseDistance = me->GetPetChaseDistance(); + + // Pets with ranged attacks should not care about the chase angle at all. + ChaseAngle angle = ChaseAngle(chaseDistance == 0.f ? float(M_PI) : 0.f, chaseDistance == 0.f ? M_PI_4 : float(M_PI_2)); + me->GetMotionMaster()->MoveChase(target, ChaseRange(0.f, chaseDistance), angle); } else // (Stay && ((Aggressive || Defensive) && In Melee Range))) { diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 03cc56cd08..f1a2a72e14 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3247,9 +3247,6 @@ bool Unit::IsMovementPreventedByCasting() const if (spell->GetSpellInfo()->IsMoveAllowedChannel()) return false; - if (const_cast(this)->HasSpellFocus()) - return false; - // prohibit movement for all other spell casts return true; } diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp index 41eddd4c77..f9cff44047 100644 --- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp +++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp @@ -48,7 +48,7 @@ static bool PositionOkay(Unit* owner, Unit* target, Optional minDistance, return false; if (maxDistance && distSq > square(*maxDistance)) return false; - if (angle && !angle->IsAngleOkay(target->GetAngle(owner))) + if (angle && !angle->IsAngleOkay(target->GetRelativeAngle(owner))) return false; if (!owner->IsWithinLOSInMap(target)) return false; @@ -74,20 +74,16 @@ bool ChaseMovementGenerator::Update(Unit* owner, uint32 diff) // our target might have gone away Unit* const target = GetTarget(); - if (!target) - return false; - - // the owner might've selected a different target (feels like we shouldn't check this here...) - if (owner->GetVictim() != target) + if (!target || !target->IsInWorld()) return false; // the owner might be unable to move (rooted or casting), pause movement if (owner->HasUnitState(UNIT_STATE_NOT_MOVE) || owner->IsMovementPreventedByCasting()) { owner->StopMoving(); + _lastTargetPosition.reset(); if (Creature* cOwner = owner->ToCreature()) cOwner->SetCannotReachTarget(false); - _lastTargetPosition.reset(); return true; }