mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-22 18:15:31 +01:00
Partly revert 6760
--HG-- branch : trunk
This commit is contained in:
@@ -11001,9 +11001,9 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
|
||||
if (GetTypeId() != TYPEID_PLAYER)
|
||||
{
|
||||
// Set home position at place of engaging combat for escorted creatures
|
||||
if ((IsAIEnabled && ((Creature*)this)->AI()->IsEscorted()) &&
|
||||
(GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE ||
|
||||
GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE))
|
||||
if (( IsAIEnabled && ((Creature*)this)->AI()->IsEscorted() ) ||
|
||||
GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE ||
|
||||
GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
|
||||
((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
|
||||
|
||||
if (enemy)
|
||||
|
||||
Reference in New Issue
Block a user