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

Core/Misc: remove incorrect ClearUnitState calls related to movement

Browse Source 
these unit states should never be removed outside motionmaster's handlings

(cherry picked from commit 79b90f9d3a)
This commit is contained in:
ccrs
2019-05-16 00:21:09 +02:00
committed by Shauren
parent 0af20f5753
commit c511fa2803
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
View File

@@ -52,19 +52,7 @@ void FollowerAI::MovementInform(uint32 type, uint32 id)
void FollowerAI::AttackStart(Unit* who)
{
if (!who)
return;
if (me->Attack(who, true))
{
me->EngageWithTarget(who); // in case it doesn't have threat+combat yet
if (me->HasUnitState(UNIT_STATE_FOLLOW))
me->ClearUnitState(UNIT_STATE_FOLLOW);
if (IsCombatMovementAllowed())
me->GetMotionMaster()->MoveChase(who);
}
ScriptedAI::AttackStart(who);
}
void FollowerAI::MoveInLineOfSight(Unit* who)

3
src/server/game/Handlers/PetHandler.cpp
View File

@@ -195,7 +195,6 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
if (!owner->IsValidAttackTarget(TargetUnit))
return;
pet->ClearUnitState(UNIT_STATE_FOLLOW);
// This is true if pet has no target or has target but targets differs.
if (pet->GetVictim() != TargetUnit || !pet->GetCharmInfo()->IsCommandAttack())
{
@@ -695,8 +694,6 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPackets::Spells::PetCastSpell&
SpellCastTargets targets(caster, petCastSpell.Cast);
caster->ClearUnitState(UNIT_STATE_FOLLOW);
Spell* spell = new Spell(caster, spellInfo, TRIGGERED_NONE);
spell->m_fromClient = true;
spell->m_misc.Raw.Data[0] = petCastSpell.Cast.Misc[0];