Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Entities/Creature: Fix bugs with pets not properly reacquiring target after spell cast. Closes #16824.

Browse Source
This commit is contained in:
treeston
2016-03-23 16:22:05 +01:00
committed by Aokromes
parent 86ed1a8f7b
commit 06d976b221
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -2715,7 +2715,9 @@ bool Creature::FocusTarget(Spell const* focusSpell, WorldObject const* target)
}
// tell the creature that it should reacquire its current target after the cast is done (this is handled in ::Attack)
MustReacquireTarget();
// player pets don't need to do this, as they automatically reacquire their target on focus release
if (!IsPet())
MustReacquireTarget();
bool canTurnDuringCast = !focusSpell->GetSpellInfo()->HasAttribute(SPELL_ATTR5_DONT_TURN_DURING_CAST);
// Face the target - we need to do this before the unit state is modified for no-turn spells
@@ -2765,13 +2767,16 @@ void Creature::ReleaseFocus(Spell const* focusSpell, bool withDelay)
if (focusSpell && focusSpell != _focusSpell)
return;
SetGuidValue(UNIT_FIELD_TARGET, ObjectGuid::Empty);
if (IsPet() && GetVictim()) // player pets do not use delay system
SetGuidValue(UNIT_FIELD_TARGET, EnsureVictim()->GetGUID());
else
SetGuidValue(UNIT_FIELD_TARGET, ObjectGuid::Empty);
if (_focusSpell->GetSpellInfo()->HasAttribute(SPELL_ATTR5_DONT_TURN_DURING_CAST))
ClearUnitState(UNIT_STATE_CANNOT_TURN);
_focusSpell = nullptr;
_focusDelay = withDelay ? getMSTime() : 0; // don't allow re-target right away to prevent visual bugs
_focusDelay = (!IsPet() && withDelay) ? getMSTime() : 0; // don't allow re-target right away to prevent visual bugs
}
void Creature::StartPickPocketRefillTimer()