From 4638c8be9fea84998a9c77f96ae62b0f6eeeb68b Mon Sep 17 00:00:00 2001 From: n0n4m3 Date: Sat, 26 Dec 2009 11:57:57 +0100 Subject: Partly revert 6760 --HG-- branch : trunk --- src/game/Unit.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 24cd4a71b16..3984614b05e 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -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) -- cgit v1.2.3