mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-24 02:46:33 +01:00
*Try to fix a crash caused by attackstop.
--HG-- branch : trunk
This commit is contained in:
@@ -8086,12 +8086,15 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
|
||||
}
|
||||
|
||||
//switch target
|
||||
m_attacking->_removeAttacker(this);
|
||||
InterruptSpell(CURRENT_MELEE_SPELL);
|
||||
if(!meleeAttack)
|
||||
clearUnitState(UNIT_STAT_MELEE_ATTACKING);
|
||||
m_attacking->_removeAttacker(this);
|
||||
}
|
||||
|
||||
m_attacking = victim;
|
||||
m_attacking->_addAttacker(this);
|
||||
|
||||
//Set our target
|
||||
SetUInt64Value(UNIT_FIELD_TARGET, victim->GetGUID());
|
||||
|
||||
@@ -8102,9 +8105,6 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
|
||||
//if(GetTypeId()==TYPEID_UNIT)
|
||||
// ((Creature*)this)->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ());
|
||||
|
||||
m_attacking = victim;
|
||||
m_attacking->_addAttacker(this);
|
||||
|
||||
//if(m_attacking->GetTypeId()==TYPEID_UNIT && ((Creature*)m_attacking)->IsAIEnabled)
|
||||
// ((Creature*)m_attacking)->AI()->AttackedBy(this);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user