diff options
| author | megamage <none@none> | 2009-03-16 11:48:25 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-16 11:48:25 -0600 |
| commit | 2453f2212324d656676693fd2b420290797a9ebf (patch) | |
| tree | 3d252d74a5b1cf89d8379c22d90285a3865592c3 /src/game/Unit.cpp | |
| parent | fdab13e3c1ebd5f516eabca33fb98972a2d1b4c4 (diff) | |
| parent | d6a1516057fdb8261ddee94f97d15a8b4f3de3c7 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 27f11be57ba..edd099b63b7 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9886,7 +9886,7 @@ void Unit::SetInCombatState(bool PvP) SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); - if(GetTypeId() != TYPEID_PLAYER) + if(GetTypeId() != TYPEID_PLAYER && GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_IDLE) != IDLE_MOTION_TYPE) ((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); if(GetTypeId() != TYPEID_PLAYER && ((Creature*)this)->isPet()) |